From dbe8c5205c576bf09aa6c3a8973e06b8902c2115 Mon Sep 17 00:00:00 2001 From: dvcdsys Date: Tue, 3 Nov 2026 14:15:53 +0000 Subject: [PATCH] chore(deps): bump the three pinned docker/* actions in one change Collapses Dependabot PRs #293, #305 and #294 into a single change. docker/setup-buildx-action v4.2.0 -> v4.4.1 (10 -> 3 occurrences updated) docker/login-action v4.5.1 -> v4.7.0 docker/build-push-action v7.3.0 -> v7.4.0 Why one PR instead of three: all three `uses:` lines sit within three lines of each other in `release-server.yml` (69/72/78 and 129/137/143) and in `prerelease-server.yml` (31/39/45). With git's default three lines of context their diff hunks overlap, so merging any one of the three Dependabot PRs leaves the other two conflicted and needing `@dependabot rebase` before they can go in. Doing all three at once removes two rebase rounds and two merges. Each SHA was taken from the corresponding Dependabot diff and then cross-checked against the upstream release tag via the GitHub API, so the pin is provably the commit the tag points at: docker/setup-buildx-action v4.4.1 = f87e5991a6d7451dcb8d9637bfbc97413f497069 docker/login-action v4.7.0 = 81c6f93d4bc991e510b342a00b419b3bb4efc5c6 docker/build-push-action v7.4.0 = c3c9e263c25d99ce0380d002d59b67737d91b0dc Scope check: the only lines this touches are `uses:` lines, in the three workflows that reference these actions -- `release-server.yml` (both the CPU multi-arch job and the CUDA job), `prerelease-server.yml`, and `llama-pin-check.yml` (setup-buildx only). No old pin remains anywhere under `.github/`. After this lands, close #293, #305 and #294 as superseded; Dependabot will not reopen them, since the dependency is already at the requested version. Co-Authored-By: Claude Opus 5 --- .github/workflows/llama-pin-check.yml | 2 +- .github/workflows/prerelease-server.yml | 6 +++--- .github/workflows/release-server.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/llama-pin-check.yml b/.github/workflows/llama-pin-check.yml index 78343568..6b826dae 100644 --- a/.github/workflows/llama-pin-check.yml +++ b/.github/workflows/llama-pin-check.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v7 - name: Set up Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 - name: Compare pinned vs upstream digest id: check diff --git a/.github/workflows/prerelease-server.yml b/.github/workflows/prerelease-server.yml index 31fccc97..5c4627c7 100644 --- a/.github/workflows/prerelease-server.yml +++ b/.github/workflows/prerelease-server.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v7 - name: Set up Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 # Reminder (never fails the build) when upstream llama.cpp has moved past # the digest pinned in Dockerfile.cuda — keeps the deliberate pin honest. @@ -36,13 +36,13 @@ jobs: run: server/scripts/check-llama-pin.sh server/Dockerfile.cuda - name: Login to Docker Hub - uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1 + uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 + uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0 with: context: server file: server/Dockerfile.cuda diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml index f4d89202..1865b3f3 100644 --- a/.github/workflows/release-server.yml +++ b/.github/workflows/release-server.yml @@ -66,16 +66,16 @@ jobs: } >> "$GITHUB_OUTPUT" - name: Set up Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 - name: Login to Docker Hub - uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1 + uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 + uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0 with: context: server file: server/Dockerfile @@ -126,7 +126,7 @@ jobs: } >> "$GITHUB_OUTPUT" - name: Set up Buildx - uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0 + uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 # Reminder (never fails the build) when upstream llama.cpp has moved past # the digest pinned in Dockerfile.cuda — keeps the deliberate pin honest. @@ -134,13 +134,13 @@ jobs: run: server/scripts/check-llama-pin.sh server/Dockerfile.cuda - name: Login to Docker Hub - uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1 + uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push - uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0 + uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0 with: context: server file: server/Dockerfile.cuda