This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new ce1e724d7e MINOR: [CI] Use `docker compose` on self-hosted ARM builds
(#43844)
ce1e724d7e is described below
commit ce1e724d7ea292746ede6a538519658f1ecab849
Author: Antoine Pitrou <[email protected]>
AuthorDate: Tue Aug 27 19:17:55 2024 +0200
MINOR: [CI] Use `docker compose` on self-hosted ARM builds (#43844)
### Rationale for this change
The Docker client version on the ARM64 self-hosted runners is now recent
enough, so we don't need to use `docker-compose` there anymore.
Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
---
.github/workflows/cpp.yml | 5 +----
.github/workflows/go.yml | 5 -----
dev/tasks/java-jars/github.yml | 2 --
dev/tasks/linux-packages/github.linux.yml | 1 -
dev/tasks/python-wheels/github.linux.yml | 1 -
5 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index a82e1eb766..c5482f7308 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -99,7 +99,6 @@ jobs:
cat <<JSON >> "$GITHUB_OUTPUT"
{
"arch": "arm64v8",
- "archery-use-legacy-docker-compose": "1",
"clang-tools": "10",
"image": "ubuntu-cpp",
"llvm": "10",
@@ -124,9 +123,6 @@ jobs:
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
env:
ARCH: ${{ matrix.arch }}
- # By default, use `docker compose` because docker-compose v1 is obsolete,
- # except where the Docker client version is too old.
- ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{
matrix.archery-use-legacy-docker-compose || '0' }}
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
CLANG_TOOLS: ${{ matrix.clang-tools }}
LLVM: ${{ matrix.llvm }}
@@ -147,6 +143,7 @@ jobs:
run: |
sudo apt update
sudo apt install -y --no-install-recommends python3 python3-dev
python3-pip
+ python3 -m pip install -U pip
- name: Setup Archery
run: python3 -m pip install -e dev/archery[docker]
- name: Execute Docker Build
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 20c78d86cb..ffd543691d 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -78,14 +78,12 @@ jobs:
{
"arch-label": "ARM64",
"arch": "arm64v8",
- "archery-use-legacy-docker-compose": "1",
"go": "1.21",
"runs-on": ["self-hosted", "arm", "linux"]
},
{
"arch-label": "ARM64",
"arch": "arm64v8",
- "archery-use-legacy-docker-compose": "1",
"go": "1.22",
"runs-on": ["self-hosted", "arm", "linux"]
}
@@ -106,9 +104,6 @@ jobs:
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
env:
ARCH: ${{ matrix.arch }}
- # By default, use Docker CLI because docker-compose v1 is obsolete,
- # except where the Docker client version is too old.
- ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{
matrix.archery-use-legacy-docker-compose || '0' }}
GO: ${{ matrix.go }}
steps:
- name: Checkout Arrow
diff --git a/dev/tasks/java-jars/github.yml b/dev/tasks/java-jars/github.yml
index 7cbd5f05da..bdbed1bd67 100644
--- a/dev/tasks/java-jars/github.yml
+++ b/dev/tasks/java-jars/github.yml
@@ -30,7 +30,6 @@ jobs:
ARCH: {{ '${{ matrix.platform.archery_arch }}' }}
ARCH_ALIAS: {{ '${{ matrix.platform.archery_arch_alias }}' }}
ARCH_SHORT: {{ '${{ matrix.platform.archery_arch_short }}' }}
- ARCHERY_USE_LEGACY_DOCKER_COMPOSE: {{
"${{matrix.platform.archery_use_legacy_docker_compose || '0'}}" }}
strategy:
fail-fast: false
matrix:
@@ -45,7 +44,6 @@ jobs:
archery_arch: "arm64v8"
archery_arch_alias: "aarch64"
archery_arch_short: "arm64"
- archery_use_legacy_docker_compose: "1"
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_free_space()|indent }}
diff --git a/dev/tasks/linux-packages/github.linux.yml
b/dev/tasks/linux-packages/github.linux.yml
index 4bf2295ef3..cce976cd60 100644
--- a/dev/tasks/linux-packages/github.linux.yml
+++ b/dev/tasks/linux-packages/github.linux.yml
@@ -29,7 +29,6 @@ jobs:
{% endif %}
env:
ARCHITECTURE: {{ architecture }}
- ARCHERY_USE_LEGACY_DOCKER_COMPOSE: {{ '1' if architecture == 'arm64'
else '0' }}
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_login_dockerhub()|indent }}
diff --git a/dev/tasks/python-wheels/github.linux.yml
b/dev/tasks/python-wheels/github.linux.yml
index 2854d4349f..97746ba3f9 100644
--- a/dev/tasks/python-wheels/github.linux.yml
+++ b/dev/tasks/python-wheels/github.linux.yml
@@ -33,7 +33,6 @@ jobs:
ARCH: amd64
{% else %}
ARCH: arm64v8
- ARCHERY_USE_LEGACY_DOCKER_COMPOSE: 1
{% endif %}
PYTHON: "{{ python_version }}"
{% if python_version == "3.13" %}
