Skip to content

Commit

Permalink
CI: Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jdavid committed Jan 23, 2024
1 parent ac55662 commit 82b1cb1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

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

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -46,13 +46,13 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build & test
uses: uraimo/run-on-arch-action@v2
with:
arch: aarch64
distro: ubuntu20.04
distro: ubuntu22.04
install: |
apt-get update -q -y
apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
Expand All @@ -70,7 +70,7 @@ jobs:
uses: uraimo/run-on-arch-action@v2
with:
arch: s390x
distro: ubuntu20.04
distro: ubuntu22.04
install: |
apt-get update -q -y
apt-get install -q -y cmake libssl-dev python3-dev python3-venv wget
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@ jobs:
os: [ubuntu-22.04, macos-latest]

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

- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.9'

- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: runner.os == 'Linux'
with:
platforms: all

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.15.0
run: python -m pip install cibuildwheel==2.16.2

- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
Expand All @@ -39,7 +41,7 @@ jobs:
pypi:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
needs: [build_wheels]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: build html

build:
OPENSSL_VERSION=3.1.3 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.7.1 sh build.sh
OPENSSL_VERSION=3.1.4 LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.7.1 sh build.sh

html: build
make -C docs html
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ skip = "pp3*"
archs = ["auto"]
build-frontend = "default"
dependency-versions = "pinned"
environment = {LIBGIT2_VERSION="1.7.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.3", LIBGIT2="/project/ci"}
environment = {LIBGIT2_VERSION="1.7.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.4", LIBGIT2="/project/ci"}

before-all = "sh build.sh"

Expand All @@ -22,5 +22,5 @@ repair-wheel-command = "LD_LIBRARY_PATH=/project/ci/lib auditwheel repair -w {de

[tool.cibuildwheel.macos]
archs = ["universal2"]
environment = {LIBGIT2_VERSION="1.7.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.3", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
environment = {LIBGIT2_VERSION="1.7.1", LIBSSH2_VERSION="1.11.0", OPENSSL_VERSION="3.1.4", LIBGIT2="/Users/runner/work/pygit2/pygit2/ci"}
repair-wheel-command = "DYLD_LIBRARY_PATH=/Users/runner/work/pygit2/pygit2/ci/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"

0 comments on commit 82b1cb1

Please sign in to comment.