From 4f51e992370627ae0dac75cd89a9c4e4d3cf50d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Sun, 21 Jan 2024 20:20:59 +0100 Subject: [PATCH] Update versions --- .github/workflows/tests.yml | 10 +++++----- .github/workflows/wheels.yml | 13 ++++++++----- Makefile | 2 +- pyproject.toml | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 07a05552..b329f5dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 8e548c50..5451f44c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - ci tags: - 'v*' @@ -16,17 +17,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 @@ -39,7 +42,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 diff --git a/Makefile b/Makefile index 2b10b97e..ad8a2bc9 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/pyproject.toml b/pyproject.toml index d287965b..c4a3a13b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" @@ -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}"