CI cleanup

ProjectBrick · Oct 25, 2023 · 16fa948 · 16fa948
1 parent 3a18618
commit 16fa948
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -10,6 +10,10 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      SHOCKPKG_PACKAGES: >-
+        flash-player-11.2.202.644-linux-i386-sa
+        flash-player-32.0.0.465-linux-x86_64-sa
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,13 +26,18 @@ jobs:
       - name: NPM
         run: npm ci
 
-      - name: shockpkg
-        run: |
-          npm exec shockpkg -- update --summary
-          npm exec shockpkg -- install \
-            flash-player-11.2.202.644-linux-i386-sa \
-            flash-player-32.0.0.465-linux-x86_64-sa
-        shell: bash
+      - name: shockpkg Cache
+        uses: actions/cache@v3
+        if: matrix.config.PKGSET != ''
+        with:
+          key: shockpkg-${{ env.SHOCKPKG_PACKAGES }}
+          path: shockpkg
+
+      - name: shockpkg Update
+        run: npm exec shockpkg -- update --summary
+
+      - name: shockpkg Install
+        run: npm exec shockpkg -- install $SHOCKPKG_PACKAGES
 
       - name: Build i386
         run: node make.mjs build:linux-i386

diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml
@@ -10,6 +10,9 @@ on:
 jobs:
   build:
     runs-on: macos-latest
+    env:
+      SHOCKPKG_PACKAGES: >-
+        flash-player-35.0.0.204-mac-x86_64-sa-2022-07-04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,12 +25,18 @@ jobs:
       - name: NPM
         run: npm ci
 
-      - name: shockpkg
-        run: |
-          npm exec shockpkg -- update --summary
-          npm exec shockpkg -- install \
-            flash-player-35.0.0.204-mac-x86_64-sa-2022-07-04
-        shell: bash
+      - name: shockpkg Cache
+        uses: actions/cache@v3
+        if: matrix.config.PKGSET != ''
+        with:
+          key: shockpkg-${{ env.SHOCKPKG_PACKAGES }}
+          path: shockpkg
+
+      - name: shockpkg Update
+        run: npm exec shockpkg -- update --summary
+
+      - name: shockpkg Install
+        run: npm exec shockpkg -- install $SHOCKPKG_PACKAGES
 
       - name: Build
         run: node make.mjs build:mac-x86_64

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -10,6 +10,10 @@ on:
 jobs:
   build:
     runs-on: windows-latest
+    env:
+      SHOCKPKG_PACKAGES: >-
+        flash-player-35.0.0.204-windows-i386-sa-2022-08-13
+        flash-player-35.0.0.204-windows-x86_64-sa-2022-08-13
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,13 +26,18 @@ jobs:
       - name: NPM
         run: npm ci
 
-      - name: shockpkg
-        run: |
-          npm exec shockpkg -- update --summary
-          npm exec shockpkg -- install \
-            flash-player-35.0.0.204-windows-i386-sa-2022-08-13 \
-            flash-player-35.0.0.204-windows-x86_64-sa-2022-08-13
-        shell: bash
+      - name: shockpkg Cache
+        uses: actions/cache@v3
+        if: matrix.config.PKGSET != ''
+        with:
+          key: shockpkg-${{ env.SHOCKPKG_PACKAGES }}
+          path: shockpkg
+
+      - name: shockpkg Update
+        run: npm exec shockpkg -- update --summary
+
+      - name: shockpkg Install
+        run: npm exec shockpkg -- install $SHOCKPKG_PACKAGES
 
       - name: Build i386
         run: node make.mjs build:windows-i386