Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add decoder compatibility argument #20687

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add decoder compatibility argument #20687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c55c7ee
Add decoder compatibility argument
ismayilov-ismayil Nov 21, 2024
d0f3e5f
Sync task version
ismayilov-ismayil Nov 21, 2024
d93ba91
Add condition to avoid using params on well-known archive formats
ismayilov-ismayil Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Tasks/ArchiveFilesV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"loc.input.help.archiveType": "Specify the compression scheme used. To create <b>`foo.jar`</b>, for example, choose <b>`zip`</b> for the compression, and specify <b>`foo.jar`</b> as the archive file to create. For all tar files (including compressed ones), choose <b>`tar`</b>.",
"loc.input.label.sevenZipCompression": "7z compression",
"loc.input.help.sevenZipCompression": "Optionally choose a compression level, or choose <b>`None`</b> to create an uncompressed 7z file.",
"loc.input.label.decoderCompatibility": "7z decoder compatibility",
"loc.input.help.decoderCompatibility": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"loc.input.label.tarCompression": "Tar compression",
"loc.input.help.tarCompression": "Optionally choose a compression scheme, or choose <b>`None`</b> to create an uncompressed tar file.",
"loc.input.label.archiveFile": "Archive file to create",
Expand Down
5 changes: 5 additions & 0 deletions Tasks/ArchiveFilesV2/archivefiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ function sevenZipArchive(archive: string, compression: string, files: string[])
sevenZip.arg('-mx=' + mapSevenZipCompressionLevel(sevenZipCompression));
}

const decoderCompatibility = tl.getInput('decoderCompatibility', false);
if (win && decoderCompatibility && archiveType == '7z') {
Copy link
Contributor

@KonstantinTyukalov KonstantinTyukalov Nov 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the PR description, should it be !win os something else as it's only for linux?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linux uses old version to archive and extract, but windows uses new version decoder for both.
if we archive on windows (new) and extract on linux (old version) it fails.
thus, we provide new param on windows only (new version 7z), old versions (linux) doesn't have this argument

sevenZip.arg('-myv=' + decoderCompatibility);
}

sevenZip.arg(archive);

const fileList: string = createFileList(files);
Expand Down
14 changes: 12 additions & 2 deletions Tasks/ArchiveFilesV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 2
"Minor": 249,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "7z decoder compatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down
14 changes: 12 additions & 2 deletions Tasks/ArchiveFilesV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 2
"Minor": 249,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "ms-resource:loc.input.label.decoderCompatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "ms-resource:loc.input.help.decoderCompatibility",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down
4 changes: 2 additions & 2 deletions _generated/ArchiveFilesV2.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|2.246.2
Node20-225|2.246.3
Default|2.249.0
Node20-225|2.249.1
2 changes: 2 additions & 0 deletions _generated/ArchiveFilesV2/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"loc.input.help.archiveType": "Specify the compression scheme used. To create <b>`foo.jar`</b>, for example, choose <b>`zip`</b> for the compression, and specify <b>`foo.jar`</b> as the archive file to create. For all tar files (including compressed ones), choose <b>`tar`</b>.",
"loc.input.label.sevenZipCompression": "7z compression",
"loc.input.help.sevenZipCompression": "Optionally choose a compression level, or choose <b>`None`</b> to create an uncompressed 7z file.",
"loc.input.label.decoderCompatibility": "7z decoder compatibility",
"loc.input.help.decoderCompatibility": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"loc.input.label.tarCompression": "Tar compression",
"loc.input.help.tarCompression": "Optionally choose a compression scheme, or choose <b>`None`</b> to create an uncompressed tar file.",
"loc.input.label.archiveFile": "Archive file to create",
Expand Down
5 changes: 5 additions & 0 deletions _generated/ArchiveFilesV2/archivefiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ function sevenZipArchive(archive: string, compression: string, files: string[])
sevenZip.arg('-mx=' + mapSevenZipCompressionLevel(sevenZipCompression));
}

const decoderCompatibility = tl.getInput('decoderCompatibility', false);
if (win && decoderCompatibility && archiveType == '7z') {
sevenZip.arg('-myv=' + decoderCompatibility);
}

sevenZip.arg(archive);

const fileList: string = createFileList(files);
Expand Down
18 changes: 14 additions & 4 deletions _generated/ArchiveFilesV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 2
"Minor": 249,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "7z decoder compatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down Expand Up @@ -164,7 +174,7 @@
"MoreFiles": "... %d more ..."
},
"_buildConfigMapping": {
"Default": "2.246.2",
"Node20-225": "2.246.3"
"Default": "2.249.0",
"Node20-225": "2.249.1"
}
}
18 changes: 14 additions & 4 deletions _generated/ArchiveFilesV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 2
"Minor": 249,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "ms-resource:loc.input.label.decoderCompatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "ms-resource:loc.input.help.decoderCompatibility",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down Expand Up @@ -164,7 +174,7 @@
"MoreFiles": "ms-resource:loc.messages.MoreFiles"
},
"_buildConfigMapping": {
"Default": "2.246.2",
"Node20-225": "2.246.3"
"Default": "2.249.0",
"Node20-225": "2.249.1"
}
}
4 changes: 4 additions & 0 deletions _generated/ArchiveFilesV2_Node20/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
scripts-prepend-node-path=true

registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/

always-auth=true
2 changes: 2 additions & 0 deletions _generated/ArchiveFilesV2_Node20/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"loc.input.help.archiveType": "Specify the compression scheme used. To create <b>`foo.jar`</b>, for example, choose <b>`zip`</b> for the compression, and specify <b>`foo.jar`</b> as the archive file to create. For all tar files (including compressed ones), choose <b>`tar`</b>.",
"loc.input.label.sevenZipCompression": "7z compression",
"loc.input.help.sevenZipCompression": "Optionally choose a compression level, or choose <b>`None`</b> to create an uncompressed 7z file.",
"loc.input.label.decoderCompatibility": "7z decoder compatibility",
"loc.input.help.decoderCompatibility": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"loc.input.label.tarCompression": "Tar compression",
"loc.input.help.tarCompression": "Optionally choose a compression scheme, or choose <b>`None`</b> to create an uncompressed tar file.",
"loc.input.label.archiveFile": "Archive file to create",
Expand Down
5 changes: 5 additions & 0 deletions _generated/ArchiveFilesV2_Node20/archivefiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ function sevenZipArchive(archive: string, compression: string, files: string[])
sevenZip.arg('-mx=' + mapSevenZipCompressionLevel(sevenZipCompression));
}

const decoderCompatibility = tl.getInput('decoderCompatibility', false);
if (win && decoderCompatibility && archiveType == '7z') {
sevenZip.arg('-myv=' + decoderCompatibility);
}

sevenZip.arg(archive);

const fileList: string = createFileList(files);
Expand Down
18 changes: 14 additions & 4 deletions _generated/ArchiveFilesV2_Node20/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 3
"Minor": 249,
"Patch": 1
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "7z decoder compatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "Optionally choose to set decoder compatibility version for 7z archive creating. It should be 4-digit number that represents the version of 7-Zip without a dot. (default: 1602)",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down Expand Up @@ -168,7 +178,7 @@
"MoreFiles": "... %d more ..."
},
"_buildConfigMapping": {
"Default": "2.246.2",
"Node20-225": "2.246.3"
"Default": "2.249.0",
"Node20-225": "2.249.1"
}
}
18 changes: 14 additions & 4 deletions _generated/ArchiveFilesV2_Node20/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"minimumAgentVersion": "2.182.1",
"version": {
"Major": 2,
"Minor": 246,
"Patch": 3
"Minor": 249,
"Patch": 1
},
"groups": [
{
Expand Down Expand Up @@ -80,6 +80,16 @@
"none": "None"
}
},
{
"name": "decoderCompatibility",
"type": "int",
"label": "ms-resource:loc.input.label.decoderCompatibility",
"required": false,
"defaultValue": 1602,
"helpMarkDown": "ms-resource:loc.input.help.decoderCompatibility",
"groupName": "archive",
"visibleRule": "archiveType = 7z"
},
{
"name": "tarCompression",
"type": "pickList",
Expand Down Expand Up @@ -168,7 +178,7 @@
"MoreFiles": "ms-resource:loc.messages.MoreFiles"
},
"_buildConfigMapping": {
"Default": "2.246.2",
"Node20-225": "2.246.3"
"Default": "2.249.0",
"Node20-225": "2.249.1"
}
}
Loading