Merge branch 'master' of github.com:ferrybig/www.ferrybig.me

ferrybig · Aug 29, 2024 · da82542 · da82542
2 parents 81c98bb + dc5f7d1
commit da82542
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,13 +11,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Fix timestamps
         run: bash .github/scripts/fix-timestamps
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       #- uses: actions/cache@v4
       #  with:
       #    path: |
@@ -28,21 +21,16 @@ jobs:
       #    restore-keys: |
       #      ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
       - uses: docker/setup-buildx-action@v3
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v6
         with:
           context: .
           target: export
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           outputs: type=local,dest=/tmp/files
           tags: www.ferrybig.me:latest
         env:
           SOURCE_DATE_EPOCH: 0
-      - name: Move cache
-        if: github.event_name == 'push'
-        run:
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -34,8 +34,11 @@ jobs: # push, pull_request
           TARGET: ${{ secrets.ssh_target }}
           ARGS: -r -l -0 -v --checksum --delete-delay
       - name: Update github discussions
-        uses: ferrybig/giscus-discussions-from-json@37eb64cac4004f8e8e5f64828008af5048137239
+        uses: ferrybig/giscus-discussions-from-json@9e5a5c6329b9138cec76986916100308f18d8f3d
         with:
           file: tmp/comments.json
           token: ${{ secrets.GITHUB_TOKEN }}
-          topicId: DIC_kwDOHBif1s4CdpTo
+          categoryId: DIC_kwDOHBif1s4CdpTo
+          repoOwner: ferrybig
+          repoName: www.ferrybig.me
+          base: https://www.ferrybig.me/