You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2024/07/01 02:05:00 UTC
(arrow-adbc) branch main updated: ci: specify platform explicitly for emulated Docker jobs (#1952)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new b3b84770f ci: specify platform explicitly for emulated Docker jobs (#1952)
b3b84770f is described below
commit b3b84770f936fe17989eb868e5bc64646dee0297
Author: David Li <li...@gmail.com>
AuthorDate: Mon Jul 1 11:04:56 2024 +0900
ci: specify platform explicitly for emulated Docker jobs (#1952)
Fixes #1951.
---
.env | 1 +
.github/workflows/packaging.yml | 15 ++++++++-------
docker-compose.yml | 1 +
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.env b/.env
index ff1a0e5fd..91843da12 100644
--- a/.env
+++ b/.env
@@ -31,6 +31,7 @@ ARCH_CONDA_FORGE=linux_64_
JDK=8
MANYLINUX=2014
MAVEN=3.6.3
+PLATFORM=linux/amd64
PYTHON=3.8
GO=1.21.8
ARROW_MAJOR_VERSION=14
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 6b26e9920..088acb29d 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -559,13 +559,15 @@ jobs:
fail-fast: false
matrix:
arch: ["amd64", "arm64v8"]
- manylinux_version: ["2014"]
is_pr:
- ${{ startsWith(github.ref, 'refs/pull/') }}
exclude:
# Don't run arm64v8 build on PRs since the build is excessively slow
- arch: arm64v8
is_pr: true
+ include:
+ - {arch: amd64, platform: linux/amd64}
+ - {arch: arm64v8, platform: linux/arm64}
steps:
- uses: actions/download-artifact@v4
with:
@@ -596,7 +598,6 @@ jobs:
- name: Build wheel
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
run: |
pushd adbc
docker compose run \
@@ -619,7 +620,7 @@ jobs:
- name: Test wheel 3.8
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
+ PLATFORM: ${{ matrix.platform }}
run: |
pushd adbc
env PYTHON=3.8 docker compose run python-wheel-manylinux-test
@@ -627,7 +628,7 @@ jobs:
- name: Test wheel 3.9
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
+ PLATFORM: ${{ matrix.platform }}
run: |
pushd adbc
env PYTHON=3.9 docker compose run python-wheel-manylinux-test
@@ -635,7 +636,7 @@ jobs:
- name: Test wheel 3.10
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
+ PLATFORM: ${{ matrix.platform }}
run: |
pushd adbc
env PYTHON=3.10 docker compose run python-wheel-manylinux-test
@@ -643,7 +644,7 @@ jobs:
- name: Test wheel 3.11
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
+ PLATFORM: ${{ matrix.platform }}
run: |
pushd adbc
env PYTHON=3.11 docker compose run python-wheel-manylinux-test
@@ -651,7 +652,7 @@ jobs:
- name: Test wheel 3.12
env:
ARCH: ${{ matrix.arch }}
- MANYLINUX: ${{ matrix.manylinux_version }}
+ PLATFORM: ${{ matrix.platform }}
run: |
pushd adbc
env PYTHON=3.12 docker compose run python-wheel-manylinux-test
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c6192f27..cedaf439f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,6 +116,7 @@ services:
python-wheel-manylinux-test:
image: ${ARCH}/python:${PYTHON}-slim
+ platform: ${PLATFORM}
volumes:
- .:/adbc:delegated
command: /adbc/ci/scripts/python_wheel_unix_test.sh /adbc