Skip to content

Commit 6b4977d

Browse files
DX-120970 Fix CI: ubuntu-24.04-arm runner, docker-compose shim, remove brew pin
- Replace unavailable buildjet-8vcpu-ubuntu-2204-arm with ubuntu-24.04-arm - Add docker-compose shim: ubuntu-24.04-arm ships only Docker Compose v2 as a plugin (docker compose); archery requires the standalone binary - Remove brew pin cmake/boost: newer Homebrew (runner >=20260525) resolves cmake via the API and hits the cmake cask when pinning; the pins are not needed in CI since no brew upgrade runs after the local tap install
1 parent 601cb68 commit 6b4977d

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

dev/tasks/java-jars/github.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
archery_arch: "amd64"
4141
archery_arch_alias: "x86_64"
4242
archery_arch_short: "amd64"
43-
- runs_on: ["buildjet-8vcpu-ubuntu-2204-arm"]
43+
- runs_on: ["ubuntu-24.04-arm"]
4444
arch: "aarch_64"
4545
archery_arch: "arm64v8"
4646
archery_arch_alias: "aarch64"
@@ -67,6 +67,11 @@ jobs:
6767
env:
6868
{{ macros.github_set_sccache_envvars()|indent(8) }}
6969
run: |
70+
# ubuntu-24.04-arm ships Docker Compose v2 as a plugin only; archery needs standalone docker-compose
71+
if ! command -v docker-compose &>/dev/null; then
72+
printf '#!/bin/sh\nexec docker compose "$@"\n' | sudo tee /usr/local/bin/docker-compose >/dev/null
73+
sudo chmod +x /usr/local/bin/docker-compose
74+
fi
7075
archery docker run \
7176
-e ARROW_JAVA_BUILD=OFF \
7277
-e ARROW_JAVA_TEST=OFF \
@@ -148,8 +153,6 @@ jobs:
148153
cp ./homebrew-custom/Formula/*.rb "$(brew --repo local/homebrew-custom)/Formula/"
149154
brew install -v local/homebrew-custom/cmake
150155
brew install -v local/homebrew-custom/boost
151-
brew pin cmake
152-
brew pin boost
153156
#
154157
155158

0 commit comments

Comments
 (0)