From 6e9a6f78e5acab917d44794784b188f30441ae3d Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 14 Oct 2023 11:56:44 +0200 Subject: [PATCH 1/4] chore(ci): use GHA built-in concurrency This removes warnings related to `styfle/cancel-workflow-action@0.9.1` usage. It uses the same setting as the bsd workflow. Signed-off-by: mayeut --- .github/workflows/build.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bb8d108b..0e3168da7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,12 @@ # * https://github.com/actions/checkout # * https://github.com/actions/setup-python # * https://github.com/actions/upload-artifact -# * https://github.com/marketplace/actions/cancel-workflow-action on: [push, pull_request] name: build +concurrency: + group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }} + cancel-in-progress: true jobs: # Linux + macOS + Windows Python 3 py3: @@ -33,11 +35,6 @@ jobs: archs: "x86" steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: @@ -79,11 +76,6 @@ jobs: CIBW_BUILD: 'cp27-*' steps: - - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.9.1 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: From 8945a0b8af5fbfa614b92f0289668f2c30404010 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 14 Oct 2023 11:58:59 +0200 Subject: [PATCH 2/4] chore(ci): bump `actions/checkout` to v4 Signed-off-by: mayeut --- .github/workflows/bsd.yml | 6 +++--- .github/workflows/build.yml | 8 ++++---- .github/workflows/issues.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 9c811d183..efae0fc9b 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -13,7 +13,7 @@ jobs: freebsd: runs-on: macos-12 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run tests uses: vmactions/freebsd-vm@v0 with: @@ -30,7 +30,7 @@ jobs: openbsd: runs-on: macos-12 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run tests uses: vmactions/openbsd-vm@v0 with: @@ -48,7 +48,7 @@ jobs: netbsd: runs-on: macos-12 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run tests uses: vmactions/netbsd-vm@v0 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e3168da7..1e3fb63fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: archs: "x86" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.11 @@ -76,7 +76,7 @@ jobs: CIBW_BUILD: 'cp27-*' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -101,7 +101,7 @@ jobs: linters: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.x @@ -115,7 +115,7 @@ jobs: needs: [py2, py3] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: 3.x diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 245d00cb4..3d3adbf83 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: # install python - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Python uses: actions/setup-python@v4 with: From 9705e582856a50b687bd59a07d469652e678ac91 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 14 Oct 2023 12:00:07 +0200 Subject: [PATCH 3/4] chore(ci): bump `pypa/cibuildwheel` to v2.16.2 Signed-off-by: mayeut --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e3fb63fe..097d58e1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: python-version: 3.11 - name: Create wheels + run tests - uses: pypa/cibuildwheel@v2.14.1 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_ARCHS: "${{ matrix.archs }}" CIBW_PRERELEASE_PYTHONS: True From e4ebf584e4d624d0bafd2864df6de1e42575c550 Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 14 Oct 2023 12:02:11 +0200 Subject: [PATCH 4/4] chore(ci): increase timeout from 20m to 30m With Python 3.12 now being tested, workflow runs are reaching timeout a bit too often. Increase the timeout to reduce workflow failures. Signed-off-by: mayeut --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 097d58e1f..df248a630 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: py3: name: py3-${{ matrix.os }}-${{ startsWith(matrix.os, 'windows') && matrix.archs || 'all' }} runs-on: ${{ matrix.os }} - timeout-minutes: 20 + timeout-minutes: 30 strategy: fail-fast: false matrix: