From bf3b1876d53e512976ff8adf19e5b95b03a3c98b Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Mon, 2 Dec 2024 16:49:25 +0000 Subject: [PATCH 1/8] ci: run ffi-check on aarch64 linux --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed24957ad2a..17ff6b833cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,6 +148,28 @@ jobs: if: ${{ endsWith(inputs.python-version, '-dev') || (steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && !startsWith(inputs.python-version, 'graalpy') && !(inputs.python-version == 'pypy3.9' && contains(inputs.os, 'windows'))) }} run: nox -s ffi-check + - if: ${{ inputs.rust == 'stable' && inputs.os == 'ubuntu-latest' && !startsWith(inputs.python-version, 'graalpy') && !startsWith(inputs.python-version, 'pypy') }} + uses: uraimo/run-on-arch-action@v2.7.2 + name: FFI check on aarch64 + with: + arch: aarch64 + distro: ubuntu22.04 + install: | + set -x + if command -v apt-get &> /dev/null; then + echo "installing python & pip with apt-get..." + apt-get update + apt-get install -y --no-install-recommends python3 python3-pip python3-venv git + else + echo "installing python & pip with apk..." + apk update + apk add python3 py3-pip git + fi + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + run: | + pip install nox + nox -s ffi-check + env: CARGO_TERM_VERBOSE: true CARGO_BUILD_TARGET: ${{ inputs.rust-target }} From dc5df4f14b820183821de528763b032fd062ce3d Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 10:44:00 +0800 Subject: [PATCH 2/8] Use run-on-arch-action 2.8.1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17ff6b833cc..bd68a9f6edd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: run: nox -s ffi-check - if: ${{ inputs.rust == 'stable' && inputs.os == 'ubuntu-latest' && !startsWith(inputs.python-version, 'graalpy') && !startsWith(inputs.python-version, 'pypy') }} - uses: uraimo/run-on-arch-action@v2.7.2 + uses: uraimo/run-on-arch-action@v2.8.1 name: FFI check on aarch64 with: arch: aarch64 From cbfa7e70d38cba95529dcabfe4db4db048fdbfb6 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 11:29:09 +0800 Subject: [PATCH 3/8] Install curl --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd68a9f6edd..9636eed54c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,11 +159,11 @@ jobs: if command -v apt-get &> /dev/null; then echo "installing python & pip with apt-get..." apt-get update - apt-get install -y --no-install-recommends python3 python3-pip python3-venv git + apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl else echo "installing python & pip with apk..." apk update - apk add python3 py3-pip git + apk add python3 py3-pip git curl fi curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh run: | From 7365cffbbc7d0ce16aec87c0016439adcc11bede Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 11:54:03 +0800 Subject: [PATCH 4/8] non-interactive rustup installation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9636eed54c1..f9f40ea4bf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: apk update apk add python3 py3-pip git curl fi - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y run: | pip install nox nox -s ffi-check From bac20d10d5546bbb825f7e109dbef8a8e35c4871 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 12:42:14 +0800 Subject: [PATCH 5/8] source cargo env --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9f40ea4bf3..5a31e7bf39e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,6 +167,7 @@ jobs: fi curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y run: | + source ~/.cargo/env pip install nox nox -s ffi-check From 609672350de3ea0ffcecc7cd6e1c4cd2e0fecaca Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 13:11:15 +0800 Subject: [PATCH 6/8] Install build-essential --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a31e7bf39e..52efe559d08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: if command -v apt-get &> /dev/null; then echo "installing python & pip with apt-get..." apt-get update - apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl + apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl build-essential else echo "installing python & pip with apk..." apk update From b6db3725730d56c789e236bc0dd458cb7dbb6a4a Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 13:40:27 +0800 Subject: [PATCH 7/8] Install clang --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52efe559d08..476227c1b59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: if command -v apt-get &> /dev/null; then echo "installing python & pip with apt-get..." apt-get update - apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl build-essential + apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl build-essential clang else echo "installing python & pip with apk..." apk update From 0dd8bf4ed8e5af472e9d29dc63031a95e1b664af Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 3 Dec 2024 15:34:30 +0800 Subject: [PATCH 8/8] Install python3-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 476227c1b59..bc03e2f27ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,7 +159,7 @@ jobs: if command -v apt-get &> /dev/null; then echo "installing python & pip with apt-get..." apt-get update - apt-get install -y --no-install-recommends python3 python3-pip python3-venv git curl build-essential clang + apt-get install -y --no-install-recommends python3-dev python3-pip python3-venv git curl build-essential clang else echo "installing python & pip with apk..." apk update