From f9b19b872d8915cd9ed28457b86adc0d6088902a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 30 Sep 2025 15:11:54 -0700 Subject: [PATCH 1/2] workflows: bump action versions No breaking changes. Signed-off-by: Benjamin Gilbert --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/container-linux.yml | 2 +- .github/workflows/container-windows.yml | 2 +- .github/workflows/main.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- .github/workflows/update-check.yml | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7089094..9b5e834e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,14 +70,14 @@ jobs: version: ${{ steps.prep.outputs.version }} steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: ${{ inputs.openslide_bin_repo }} ref: ${{ inputs.openslide_bin_ref }} - name: Check out OpenSlide if: inputs.openslide_repo != '' - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: repository: ${{ inputs.openslide_repo }} ref: ${{ inputs.openslide_ref }} @@ -189,7 +189,7 @@ jobs: python3 -m pip install --break-system-packages license-expression \ packaging - name: Download source tarball - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: ${{ needs.sdist.outputs.archive }} - name: Unpack source tarball @@ -200,7 +200,7 @@ jobs: "${{ needs.sdist.outputs.archive }}" - name: Download overrides if: inputs.openslide_repo != '' - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-overrides - name: Unpack overrides @@ -237,11 +237,11 @@ jobs: runs-on: windows-latest steps: - name: Update Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' - name: Download archives - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: pattern: "openslide[-_]bin-${{ needs.sdist.outputs.version }}*" path: archives diff --git a/.github/workflows/container-linux.yml b/.github/workflows/container-linux.yml index 629a5f36..d24de564 100644 --- a/.github/workflows/container-linux.yml +++ b/.github/workflows/container-linux.yml @@ -33,7 +33,7 @@ jobs: sudo apt-get update sudo apt-get -y install qemu-user-static - name: Check out repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Build container # Cross-build the arm64 container from amd64 for simplicity run: | diff --git a/.github/workflows/container-windows.yml b/.github/workflows/container-windows.yml index 12d4dd30..f4ad8e1f 100644 --- a/.github/workflows/container-windows.yml +++ b/.github/workflows/container-windows.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Build container run: | podman build -t $CONTAINER_IMAGE builder/windows diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4615825..a737d606 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' - name: Run pre-commit hooks @@ -32,7 +32,7 @@ jobs: windows_builder_repo_and_digest: ${{ steps.find-windows.outputs.builder_repo_and_digest }} steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Find Linux builder container digest id: find-linux uses: ./.github/find-container-digest diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fba92023..36ddd6ef 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' - name: Run pre-commit hooks @@ -31,7 +31,7 @@ jobs: windows_builder_repo_and_digest: ${{ steps.find-windows.outputs.builder_repo_and_digest }} steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Find Linux builder container digest id: find-linux uses: ./.github/find-container-digest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90b91d07..6e60fbbc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: windows_builder_repo_and_digest: ${{ steps.find-windows.outputs.builder_repo_and_digest }} steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Find Linux builder container digest id: find-linux uses: ./.github/find-container-digest @@ -56,11 +56,11 @@ jobs: id-token: write steps: - name: Update Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' - name: Download artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: pattern: "openslide[-_]bin-*" path: upload diff --git a/.github/workflows/update-check.yml b/.github/workflows/update-check.yml index 6a138037..c76aed94 100644 --- a/.github/workflows/update-check.yml +++ b/.github/workflows/update-check.yml @@ -27,13 +27,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Update Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' - name: Install dependencies run: pip install --user meson requests - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: token: ${{ secrets.OPENSLIDE_BOT_TOKEN }} - name: Get bot username From 5c56b96c9c57083eff4ac3c0aa45746347b723cb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 30 Sep 2025 15:15:01 -0700 Subject: [PATCH 2/2] workflows: open-code pre-commit check The pre-commit action is in maintenance mode, and is easily replicated. Signed-off-by: Benjamin Gilbert --- .github/workflows/main.yml | 9 ++++++++- .github/workflows/pr.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a737d606..23856ea4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,8 +21,15 @@ jobs: uses: actions/setup-python@v6 with: python-version: '3.13' + - name: Install dependencies + run: python -m pip install pre-commit + - name: Cache pre-commit environments + uses: actions/cache@v4 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }} - name: Run pre-commit hooks - uses: pre-commit/action@v3.0.1 + run: pre-commit run -a --show-diff-on-failure --color=always setup: name: Set up runs-on: ubuntu-latest diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 36ddd6ef..14998884 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,8 +20,15 @@ jobs: uses: actions/setup-python@v6 with: python-version: '3.13' + - name: Install dependencies + run: python -m pip install pre-commit + - name: Cache pre-commit environments + uses: actions/cache@v4 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }} - name: Run pre-commit hooks - uses: pre-commit/action@v3.0.1 + run: pre-commit run -a --show-diff-on-failure --color=always setup: name: Set up runs-on: ubuntu-latest