From a62d5a253658990bb1025b25baee7e50b736e993 Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Mon, 1 Jun 2026 16:33:35 -0400 Subject: [PATCH 1/2] ci: override ImageOS env var for aarch linux The Elixir job has started failing because it says the `ImageOS` env var is no longer one of a set of blessed values (it wants `ubuntu24` but sees `ubuntu24-arm`). I'm guessing GitHub changed how they name the runner images recently. This value is used to select the dependency bundle to download from Hex, so overriding it like this is fine, at least until the maintainers of the BEAM action update their infrastructure to catch up with the GitHub rename, which will probably cause this to break again. Signed-off-by: Nathan Perry Change-Id: I3cc65790ad65130486bb98c434b9c2f46a6a6964 --- .github/workflows/elixir.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 9c22746..2004628 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -84,6 +84,17 @@ jobs: ts_elixir/deps/ key: ${{ matrix.platform.triple }}-mix-${{ env.cache_key }}-elixir-${{ matrix.elixir.version }}-otp-${{ matrix.otp.version }}-${{ hashFiles('**/mix.lock') }} + # The setup-beam action uses the `ImageOS` env var to select the dependency bundle to + # download from Hex, and so it needs to be one of a few blessed values. GitHub seems + # to have changed how they set this variable recently, including `-arm` for aarch64 + # linux. This broke `setup-beam`, so we put it back how it was here and restore + # afterwards. + - name: Override ImageOS + if: ${{ matrix.platform.runner == 'linux-arm64-16cpu' }} + run: |- + echo ImageOSPrev="$ImageOS" >> $GITHUB_ENV + echo ImageOS=ubuntu24 >> $GITHUB_ENV + - name: Install elixir id: install-elixir uses: erlef/setup-beam@fc68ffb90438ef2936bbb3251622353b3dcb2f93 # 1.24.0 @@ -91,6 +102,11 @@ jobs: otp-version: ${{ matrix.otp.version }} elixir-version: ${{ matrix.elixir.version }} + - name: Restore ImageOS + if: ${{ matrix.platform.runner == 'linux-arm64-16cpu' }} + run: |- + echo ImageOS="$ImageOSPrev" >> $GITHUB_ENV + - name: Setup rust id: setup-rust uses: ./.github/actions/setup-rust From 0a7153598d96f46726b8a605ae4474dc309f94ad Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Tue, 2 Jun 2026 12:58:44 -0400 Subject: [PATCH 2/2] workspace: bump russh to resolve RUSTSEC-2026-0154 Signed-off-by: Nathan Perry Change-Id: I797e65d545f2c82feeb59911ed4aea2c6a6a6964 --- Cargo.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be50a5b..ce3566b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,7 +138,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -149,7 +149,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1488,7 +1488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1760,8 +1760,8 @@ dependencies = [ "libc", "log", "rustversion", - "windows-link 0.2.1", - "windows-result 0.4.1", + "windows-link 0.1.3", + "windows-result 0.3.4", ] [[package]] @@ -2217,7 +2217,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core 0.61.2", ] [[package]] @@ -3054,7 +3054,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4186,9 +4186,9 @@ dependencies = [ [[package]] name = "russh" -version = "0.60.2" +version = "0.60.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e358980fe9b079b99da387117864ee6f0a3fd02f39e5b5fde6af9c2895374" +checksum = "324b92f459d3e42da294e14e8eb150d2215fcfb7c966838bc1127cd68bc05a0d" dependencies = [ "aead 0.6.0-rc.10", "aes 0.8.4", @@ -4266,9 +4266,9 @@ dependencies = [ [[package]] name = "russh-cryptovec" -version = "0.59.0" +version = "0.60.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36140e8a20297bc2e8338807c3d9ca911f7fa49d7539cbcd6d48d3befd70efd8" +checksum = "37cb4d0360bdd8935392a306d8b5edb539cc455b30e8bf13dd213a0cf7879b40" dependencies = [ "log", "nix 0.31.3", @@ -4334,7 +4334,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4416,7 +4416,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4889,7 +4889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5117,7 +5117,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5127,7 +5127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6683,7 +6683,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]]