Merge pull request #3517 from native-api/ci_ubuntu_arm

CI: add ubuntu ARM images
This commit is contained in:
native-api 2026-08-13 01:51:46 +03:00 committed by GitHub
commit cb20e375d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions

View File

@ -207,7 +207,9 @@ jobs:
python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}} python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
os: os:
- ubuntu-22.04 - ubuntu-22.04
- ubuntu-22.04-arm
- ubuntu-24.04 - ubuntu-24.04
- ubuntu-24.04-arm
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
@ -270,8 +272,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}} python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
os: ["ubuntu-latest"] runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
- run: | - run: |

View File

@ -14,7 +14,9 @@ jobs:
matrix: matrix:
os: os:
- ubuntu-22.04 - ubuntu-22.04
- ubuntu-22.04-arm
- ubuntu-24.04 - ubuntu-24.04
- ubuntu-24.04-arm
- macos-14 - macos-14
- macos-15 - macos-15
- macos-15-intel - macos-15-intel
@ -22,25 +24,22 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
- run: | - name: Install prerequisites
run: |
if test "$RUNNER_OS" == "macOS"; then if test "$RUNNER_OS" == "macOS"; then
brew install coreutils fish brew install coreutils fish
fi fi
- run: pwd - name: Run tests
- env:
PYENV_ROOT: /home/runner/work/pyenv/pyenv
run: |
echo $PYENV_ROOT
echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
- name: Run test on the host
run: | run: |
make test make test
- name: Run test with docker
if: ${{ ! contains(matrix.os, 'macos') }}
run: |
make test-docker
- env: - env:
PYENV_NATIVE_EXT: 1 PYENV_NATIVE_EXT: 1
run: | run: |
(cd src; ./configure; make) (cd src; ./configure; make)
bats/bin/bats test/{pyenv,hooks,versions}.bats bats/bin/bats test/{pyenv,hooks,versions}.bats
pyenv_tests_docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- run: |
make test-docker