From d8a673c32a3db28216caec113458c467ed4a7ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Tue, 31 Dec 2024 16:21:24 +0100 Subject: [PATCH] CI tests: clarify jobs --- .github/workflows/tests.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3424d5b1..df1ce40d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: - '**.rst' jobs: - x86_64: + linux-x86_64: runs-on: ${{ matrix.os }} strategy: matrix: @@ -18,8 +18,6 @@ jobs: python-version: '3.13' - os: ubuntu-24.04 python-version: 'pypy3.10' - - os: macos-latest - python-version: '3.10' steps: - name: Checkout pygit2 @@ -31,18 +29,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Linux - if: runner.os == 'Linux' run: | sudo apt install tinyproxy LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test - - name: macOS - if: runner.os == 'macOS' - run: | - export OPENSSL_PREFIX=`brew --prefix openssl@1.1` - LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test - - aarch64: + linux-arm64: runs-on: ubuntu-24.04 steps: - name: Checkout @@ -59,7 +50,7 @@ jobs: run: | LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test - s390x: + linux-s390x: runs-on: ubuntu-24.04 if: github.ref == 'refs/heads/master' steps: @@ -77,3 +68,19 @@ jobs: run: | LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test continue-on-error: true # Tests are expected to fail, see issue #812 + + macos-arm64: + runs-on: macos-latest + steps: + - name: Checkout pygit2 + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + + - name: macOS + run: | + export OPENSSL_PREFIX=`brew --prefix openssl@1.1` + LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.0 /bin/sh build.sh test