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

Show file tree
Hide file tree
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
Remove root folder, use bin folder
  • Loading branch information
@bebound
bebound committed Jan 22, 2024
commit 95264cd906de0e120b0967ea00225ce5ca3b90c9
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ jobs:
- task: PowerShell@2
displayName: Expand and Load CLI
inputs:
filePath: build_scripts\windows\scripts\test_zip_package.ps1
filePath: build_scripts\windows\scripts\test_zip_installation.ps1

- job: BuildDockerImageAlpine
displayName: Build Docker Image Alpine
Expand Down
12 changes: 5 additions & 7 deletions build_scripts/windows/scripts/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ set ARTIFACTS_DIR=%~dp0..\artifacts
mkdir %ARTIFACTS_DIR%
set TEMP_SCRATCH_FOLDER=%ARTIFACTS_DIR%\cli_scratch
set BUILDING_DIR=%ARTIFACTS_DIR%\cli
set ZIP_ROOT_FOLDER="AzureCLI"
set WIX_DIR=%ARTIFACTS_DIR%\wix
set PYTHON_DIR=%ARTIFACTS_DIR%\Python

Expand Down Expand Up @@ -154,14 +153,15 @@ popd
REM Remove pywin32 help file to reduce size.
del %BUILDING_DIR%\Lib\site-packages\PyWin32.chm

echo Creating the wbin (Windows binaries) folder that will be added to the path...
mkdir %BUILDING_DIR%\wbin
if "%TARGET%"=="msi" (
echo Creating the wbin (Windows binaries) folder that will be added to the path...
mkdir %BUILDING_DIR%\wbin
copy %REPO_ROOT%\build_scripts\windows\scripts\az_msi.cmd %BUILDING_DIR%\wbin\az.cmd
copy %REPO_ROOT%\build_scripts\windows\scripts\azps.ps1 %BUILDING_DIR%\wbin\
copy %REPO_ROOT%\build_scripts\windows\scripts\az %BUILDING_DIR%\wbin\
) else (
copy %REPO_ROOT%\build_scripts\windows\scripts\az_zip.cmd %BUILDING_DIR%\wbin\az.cmd
mkdir %BUILDING_DIR%\bin
copy %REPO_ROOT%\build_scripts\windows\scripts\az_zip.cmd %BUILDING_DIR%\bin\az.cmd
)
if %errorlevel% neq 0 goto ERROR
copy %REPO_ROOT%\build_scripts\windows\resources\CLI_LICENSE.rtf %BUILDING_DIR%
Expand Down Expand Up @@ -214,9 +214,7 @@ if "%TARGET%"=="msi" (
msbuild /t:rebuild /p:Configuration=Release /p:Platform=%ARCH% %REPO_ROOT%\build_scripts\windows\azure-cli.wixproj
) else (
echo Building ZIP...
REM Rename to zip root folder
ren %BUILDING_DIR% %ZIP_ROOT_FOLDER%
"%ProgramFiles%\7-Zip\7z.exe" a -tzip "%OUTPUT_DIR%\Microsoft Azure CLI.zip" "%ARTIFACTS_DIR%\%ZIP_ROOT_FOLDER%"
"%ProgramFiles%\7-Zip\7z.exe" a -tzip "%OUTPUT_DIR%\Microsoft Azure CLI.zip" "%BUILDING_DIR%\*"
)

if %errorlevel% neq 0 goto ERROR
Expand Down
4 changes: 2 additions & 2 deletions ...ipts/windows/scripts/test_zip_package.ps1 → ...windows/scripts/test_zip_installation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
Set-PSDebug -Trace 1

Write-Output "Extracting zip to $env:SYSTEM_ARTIFACTSDIRECTORY\zip\"
& "C:\Program Files\7-Zip\7z.exe" x -o"$env:SYSTEM_ARTIFACTSDIRECTORY\zip\" "$env:SYSTEM_ARTIFACTSDIRECTORY\zip\Microsoft Azure CLI.zip"
& "C:\Program Files\7-Zip\7z.exe" x -o"$env:SYSTEM_ARTIFACTSDIRECTORY\zip\Azure CLI" "$env:SYSTEM_ARTIFACTSDIRECTORY\zip\Microsoft Azure CLI.zip"

$az_full_path = "$env:SYSTEM_ARTIFACTSDIRECTORY\zip\AzureCLI\wbin\az.cmd"
$az_full_path = "$env:SYSTEM_ARTIFACTSDIRECTORY\zip\Azure CLI\bin\az.cmd"

& $az_full_path --version

Expand Down