From a9648082047dee009c16055b66ea044078e7d5ec Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Mon, 20 Jul 2026 15:47:14 -0500 Subject: [PATCH 1/2] include unzip for linux-arm64 --- eng/pack/scripts/nix_arm64_deps.sh | 8 +++++--- eng/pack/scripts/rc_nix_arm64_deps.sh | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/pack/scripts/nix_arm64_deps.sh b/eng/pack/scripts/nix_arm64_deps.sh index 5bef0b7b..bf473542 100644 --- a/eng/pack/scripts/nix_arm64_deps.sh +++ b/eng/pack/scripts/nix_arm64_deps.sh @@ -41,11 +41,13 @@ ls -la /tmp/arm64_wheels/ # Install ARM64 wheels from the downloaded files echo "Installing ARM64 dependencies from downloaded wheels..." -# Extract wheel files manually to bypass platform compatibility checks -# Wheels are just ZIP archives, so we can extract them directly +# Extract wheel files manually to bypass platform compatibility checks. +# Wheels are just ZIP archives, so we extract them with Python's built-in +# zipfile module (unzip is not available on the minimal image and the venv +# Python is already on PATH here). for wheel in /tmp/arm64_wheels/*.whl; do echo "Extracting $wheel..." - unzip -o -q "$wheel" -d $BUILD_SOURCESDIRECTORY/deps + python -m zipfile -e "$wheel" $BUILD_SOURCESDIRECTORY/deps done # Remove .dist-info directories to avoid conflicts diff --git a/eng/pack/scripts/rc_nix_arm64_deps.sh b/eng/pack/scripts/rc_nix_arm64_deps.sh index 5bef0b7b..bf473542 100644 --- a/eng/pack/scripts/rc_nix_arm64_deps.sh +++ b/eng/pack/scripts/rc_nix_arm64_deps.sh @@ -41,11 +41,13 @@ ls -la /tmp/arm64_wheels/ # Install ARM64 wheels from the downloaded files echo "Installing ARM64 dependencies from downloaded wheels..." -# Extract wheel files manually to bypass platform compatibility checks -# Wheels are just ZIP archives, so we can extract them directly +# Extract wheel files manually to bypass platform compatibility checks. +# Wheels are just ZIP archives, so we extract them with Python's built-in +# zipfile module (unzip is not available on the minimal image and the venv +# Python is already on PATH here). for wheel in /tmp/arm64_wheels/*.whl; do echo "Extracting $wheel..." - unzip -o -q "$wheel" -d $BUILD_SOURCESDIRECTORY/deps + python -m zipfile -e "$wheel" $BUILD_SOURCESDIRECTORY/deps done # Remove .dist-info directories to avoid conflicts From fc94427a680e51d0b5fd6b64df5627c1dab18bb3 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Tue, 21 Jul 2026 09:47:30 -0500 Subject: [PATCH 2/2] move release pipeline to full images --- eng/templates/official/release/build-artifacts.yml | 2 +- eng/templates/official/release/bump-version.yml | 2 +- eng/templates/official/release/publish-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/templates/official/release/build-artifacts.yml b/eng/templates/official/release/build-artifacts.yml index ff3cf4a6..7b49a145 100644 --- a/eng/templates/official/release/build-artifacts.yml +++ b/eng/templates/official/release/build-artifacts.yml @@ -34,7 +34,7 @@ jobs: pool: name: 1es-pool-azfunc - image: 1es-ubuntu-24.04-min + image: 1es-ubuntu-22.04 os: linux templateContext: diff --git a/eng/templates/official/release/bump-version.yml b/eng/templates/official/release/bump-version.yml index 9af318ca..031278e6 100644 --- a/eng/templates/official/release/bump-version.yml +++ b/eng/templates/official/release/bump-version.yml @@ -46,7 +46,7 @@ jobs: displayName: 'Create Release Branch' pool: name: 1es-pool-azfunc - image: 1es-ubuntu-24.04-min + image: 1es-ubuntu-22.04 os: linux steps: - powershell: | diff --git a/eng/templates/official/release/publish-release.yml b/eng/templates/official/release/publish-release.yml index 386c7a0b..dd79d0b7 100644 --- a/eng/templates/official/release/publish-release.yml +++ b/eng/templates/official/release/publish-release.yml @@ -236,7 +236,7 @@ jobs: pool: name: 1es-pool-azfunc - image: 1es-ubuntu-24.04-min + image: 1es-ubuntu-22.04 os: linux steps: