Skip to content

Commit

Permalink
Merge pull request #361 from lazka/ci-update-actions
Browse files Browse the repository at this point in the history
CI: update various actions
  • Loading branch information
lazka committed Feb 11, 2024
2 parents 70bf138 + 65e8085 commit 2f1dce1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
arch: i686
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: setup-msys2
uses: msys2/setup-msys2@v2
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
python setup.py install --root="$(pwd)"/_root_abs
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- name: Build & Install with pip
shell: msys2 {0}
Expand All @@ -76,10 +76,10 @@ jobs:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
allow-prereleases: true
Expand All @@ -102,7 +102,7 @@ jobs:
python setup.py install --root="$(pwd)"/_root_abs
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- name: Build & Install with pip
run: |
Expand Down Expand Up @@ -142,10 +142,10 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
architecture: ['x86', 'x64']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
Expand Down Expand Up @@ -189,19 +189,19 @@ jobs:
if (-not $?) { exit 1 }
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.python-version }}
name: wheels-${{ matrix.python-version }}-${{ matrix.architecture }}
path: dist/pycairo*.whl

macos:
runs-on: macos-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: |
Expand All @@ -219,7 +219,7 @@ jobs:
python3 -m pip install .
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- name: Build & Install with pip
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cairo_plat: arm64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build wheels
uses: pypa/cibuildwheel@v2.16
Expand All @@ -34,6 +34,7 @@ jobs:
CIBW_TEST_SKIP: "*-win_arm64"
CIBW_ENVIRONMENT_WINDOWS: PKG_CONFIG_PATH='${{ github.workspace }}/cairo-prebuild/lib/pkgconfig' PKG_CONFIG='${{ github.workspace }}/cairo-prebuild/bin/pkgconf.exe'

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: "wheel-${{ matrix.cairo_plat }}"
path: ./wheelhouse/*.whl

0 comments on commit 2f1dce1

Please sign in to comment.