Skip to content

[Packaging] Support Windows ZIP package #27911

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

Merged
bebound merged 21 commits into from
Jan 30, 2024
Merged

[Packaging] Support Windows ZIP package #27911

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
452a3dc
Init
bebound Nov 24, 2023
181d34b
Beta test
bebound Nov 24, 2023
2125e39
Minor fix
bebound Nov 27, 2023
74aa576
Add test
bebound Nov 27, 2023
fda9040
Minor fix
bebound Nov 28, 2023
33b2cf7
Add test
bebound Nov 28, 2023
79e3c18
Use 7z
bebound Nov 30, 2023
ef1f743
Add upgrade
bebound Nov 30, 2023
d926724
Minor fix
bebound Nov 30, 2023
72667ad
Minor fix
bebound Dec 4, 2023
deb94ac
Use LZMA
bebound Dec 6, 2023
7ed5497
Minor fix
bebound Dec 11, 2023
63207d3
Add azps_zip.ps1
bebound Jan 5, 2024
6fa7aa4
Remove x86
bebound Jan 15, 2024
0956882
Minor fix
bebound Jan 17, 2024
52552df
Minor fix
bebound Jan 17, 2024
3e6f1b5
Minor fix
bebound Jan 17, 2024
dd0f8bc
Merge branch 'dev' into zip
bebound Jan 17, 2024
95264cd
Remove root folder, use bin folder
bebound Jan 22, 2024
ac32b2d
MInor fix
bebound Jan 23, 2024
6fb6c8e
MInor fix
bebound Jan 23, 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
Prev Previous commit
Next Next commit
Use LZMA
  • Loading branch information
@bebound
bebound committed Dec 6, 2023
commit deb94acefb8a5769e54d8b880e75d3435d64d4f8
3 changes: 2 additions & 1 deletion build_scripts/windows/scripts/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ if "%TARGET%"=="msi" (
echo Building ZIP...
REM Rename zip root folder to "Azure CLI"
ren %BUILDING_DIR% "Azure CLI"
Copy link
Contributor Author

@bebound bebound Nov 28, 2023

Choose a reason for hiding this comment

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

Use Azure CLI as root folder of zip package.
PS: The MSI installation path is C:\Program Files\Microsoft SDKs\Azure\CLI2.

Copy link
Member

@jiasli jiasli Jan 16, 2024

Choose a reason for hiding this comment

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

set BUILDING_DIR=%ARTIFACTS_DIR%\cli
set ZIP_DIR=%ARTIFACTS_DIR%\Azure CLI

ren %BUILDING_DIR% "Azure CLI" renames BUILDING_DIR to %ARTIFACTS_DIR%\Azure CLI. Let's not hard code Azure CLI but use a variable.

"%ProgramFiles%\7-Zip\7z.exe" a -tzip "%OUTPUT_DIR%\Microsoft Azure CLI.zip" "%ZIP_DIR%"
REM Use LZMA compression to reduce the size of the zip file.
Copy link
Contributor Author

@bebound bebound Dec 6, 2023

Choose a reason for hiding this comment

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

zip with default deflate algorithm: 90MB
zip with LZMA algorithm: 77MB

"%ProgramFiles%\7-Zip\7z.exe" a -tzip -m0=LZMA "%OUTPUT_DIR%\Microsoft Azure CLI.zip" "%ZIP_DIR%"
Copy link
Member

@jiasli jiasli Jan 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

According to 7-Zip's manual C:\Program Files\7-Zip\7-zip.chm, only 7z type supports the {N}={MethodID}[:param1][:param2] ... [:paramN] notation:

image

For Zip, it should be m={MethodID}:

image

Copy link
Contributor Author

@bebound bebound Jan 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

You're right.
According to the doc, -m0 should only works in 7z and I should use -mm.
However, it works.
I've created a bug report for 7z: https://sourceforge.net/p/sevenzip/bugs/2441/

)

if %errorlevel% neq 0 goto ERROR
Expand Down