commit dabc0f90a3a75215726addafc35f318b66ff6cea parent 1bd43fe68de7510c18b35806b0467d2ca18613bf Author: MTRNord <MTRNord@users.noreply.github.com> Date: Wed, 25 Mar 2026 22:35:29 +0100 fix newer bookwyrm Signed-off-by: MTRNord <MTRNord@users.noreply.github.com> Diffstat:
| M | .github/workflows/build-bookwyrm.yaml | | | 10 | ++++++++-- |
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-bookwyrm.yaml b/.github/workflows/build-bookwyrm.yaml @@ -80,8 +80,14 @@ jobs: path: _gitops persist-credentials: false - - name: Apply Dockerfile patch - run: git apply _gitops/apps/talos_cluster/bookwyrm/dockerfile.patch + - name: Apply Dockerfile patch (if applicable) + run: | + if git apply --check _gitops/apps/talos_cluster/bookwyrm/dockerfile.patch 2>/dev/null; then + git apply _gitops/apps/talos_cluster/bookwyrm/dockerfile.patch + echo "Patch applied successfully" + else + echo "Patch does not apply cleanly — upstream Dockerfile likely already includes the needed changes, proceeding as-is" + fi - name: Set up QEMU uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4