ci(feed): キャッシュの復元と保存はcompositeで再利用する

yamadashy · Dec 15, 2024 · 4450921 · 4450921
1 parent 0f84f97
commit 4450921
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/.github/actions/restore-feed-cache/action.yml b/.github/actions/restore-feed-cache/action.yml
@@ -0,0 +1,17 @@
+name: 'Restore Feed Cache'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Restore feed cache
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          .cache
+          public/images/feed-thumbnails
+          public/images/feed-icons
+        # キャッシュのキーは毎回変えて保存。restore-keys によって最新が使われる
+        # see: https://github.com/actions/cache/issues/342#issuecomment-673371329
+        key: ${{ runner.os }}-feed-${{ github.run_id }}
+        restore-keys: |
+          ${{ runner.os }}-feed-
diff --git a/.github/actions/save-feed-cache/action.yml b/.github/actions/save-feed-cache/action.yml
@@ -0,0 +1,13 @@
+name: 'Save Feed Cache'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Save feed cache
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          .cache
+          public/images/feed-thumbnails
+          public/images/feed-icons
+        key: ${{ runner.os }}-feed-${{ github.run_id }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -99,24 +99,8 @@ jobs:
           node-version-file: .tool-versions
           cache: npm
       - run: npm ci
-      - uses: actions/cache/restore@v4
-        with:
-          path: |
-            .cache
-            public/images/feed-thumbnails
-            public/images/feed-icons
-          # キャッシュのキーは毎回変えて保存。restore-keys によって最新が使われる
-          # see: https://github.com/actions/cache/issues/342#issuecomment-673371329
-          key: ${{ runner.os }}-feed-images-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-feed-images-
+      - uses: ./.github/actions/restore-feed-cache
       - run: npm run feed-generate
       - run: npm run site-prepare
       - run: npm run site-build
-      - uses: actions/cache/save@v4
-        with:
-          path: |
-            .cache
-            public/images/feed-thumbnails
-            public/images/feed-icons
-          key: ${{ runner.os }}-feed-images-${{ github.run_id }}
+      - uses: ./.github/actions/save-feed-cache
diff --git a/.github/workflows/external-test.yml b/.github/workflows/external-test.yml
@@ -23,4 +23,6 @@ jobs:
           node-version-file: .tool-versions
           cache: npm
       - run: npm ci
+      - uses: ./.github/actions/restore-feed-cache
       - run: npm run test-external
+      - uses: ./.github/actions/save-feed-cache
diff --git a/.github/workflows/generate-feed.yml b/.github/workflows/generate-feed.yml
@@ -26,27 +26,11 @@ jobs:
           node-version-file: .tool-versions
           cache: npm
       - run: npm ci
-      - uses: actions/cache/restore@v4
-        with:
-          path: |
-            .cache
-            public/images/feed-thumbnails
-            public/images/feed-icons
-          # キャッシュのキーは毎回変えて保存。restore-keys によって最新が使われる
-          # see: https://github.com/actions/cache/issues/342#issuecomment-673371329
-          key: ${{ runner.os }}-feed-images-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-feed-images-
+      - uses: ./.github/actions/restore-feed-cache
       - run: npm run feed-generate
       - run: npm run site-prepare
       - run: npm run site-build
-      - uses: actions/cache/save@v4
-        with:
-          path: |
-            .cache
-            public/images/feed-thumbnails
-            public/images/feed-icons
-          key: ${{ runner.os }}-feed-images-${{ github.run_id }}
+      - uses: ./.github/actions/save-feed-cache
       - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}