From 8d7052b90bb9da69ce3f679d1dce922ff3fc708d Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 28 May 2026 07:00:38 -0700 Subject: [PATCH] ci: refresh dev test matrix --- .github/workflows/pip.yml | 6 +++++- .github/workflows/test-parallel.yml | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index fd8b3407..9f848047 100755 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -9,6 +9,10 @@ on: tags: - 'v*' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: PYTHON_VERSION: "3.13" @@ -22,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v4 + uses: astral-sh/setup-uv@v6 with: enable-cache: false diff --git a/.github/workflows/test-parallel.yml b/.github/workflows/test-parallel.yml index cc7236c1..283ab3b4 100644 --- a/.github/workflows/test-parallel.yml +++ b/.github/workflows/test-parallel.yml @@ -1,11 +1,16 @@ name: Parallel Tests on: + workflow_dispatch: pull_request: branches: [dev, main, master] push: branches: [dev] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: PYTHONIOENCODING: utf-8 PYTHONLEGACYWINDOWSSTDIO: utf-8 @@ -15,7 +20,7 @@ env: jobs: discover-tests: name: Discover test files - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: test-files: ${{ steps.set-matrix.outputs.test-files }} plugin-tests: ${{ steps.set-plugin-matrix.outputs.plugin-tests }} @@ -85,7 +90,7 @@ jobs: run-tests: name: ${{ matrix.test.name }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: discover-tests env: PYTHONPATH: ${{ github.workspace }}/abxpkg:${{ github.workspace }}/abx-plugins:${{ github.workspace }}/abx-dl @@ -116,13 +121,13 @@ jobs: run: git clone --depth=1 https://github.com/ArchiveBox/abx-dl.git abx-dl - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} architecture: x64 - name: Install uv - uses: astral-sh/setup-uv@v4 + uses: astral-sh/setup-uv@v6 with: version: "latest" @@ -132,7 +137,7 @@ jobs: node-version: 22 - name: Cache uv - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/uv key: ${{ runner.os }}-${{ matrix.python }}-uv-${{ hashFiles('pyproject.toml') }} @@ -156,7 +161,7 @@ jobs: plugin-tests: name: ${{ matrix.plugin.name }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: discover-tests env: PYTHONPATH: ${{ github.workspace }}/abxpkg:${{ github.workspace }}/abx-plugins:${{ github.workspace }}/abx-dl @@ -186,13 +191,13 @@ jobs: run: git clone --depth=1 https://github.com/ArchiveBox/abx-dl.git abx-dl - name: Set up Python 3.13 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.13" architecture: x64 - name: Install uv - uses: astral-sh/setup-uv@v4 + uses: astral-sh/setup-uv@v6 with: version: "latest" @@ -202,7 +207,7 @@ jobs: node-version: 22 - name: Cache uv - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/uv key: ${{ runner.os }}-3.13-uv-${{ hashFiles('pyproject.toml') }}