try split action cache

atomicdata-dev · Jul 26, 2023 · 3b797ed · 3b797ed
1 parent 5e91e27
commit 3b797ed
Showing 1 changed file with 39 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,21 +23,10 @@ jobs:
           command: fmt
           args: --all -- --check
 
-  e2e:
-    name: End-to-end tests
+  build_js:
+    name: Build JS assets
     runs-on: ubuntu-latest
     steps:
-      - run: |
-          sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0  libayatana-appindicator3-dev
-
-      - uses: pnpm/action-setup@v2.0.1
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 8
-          run_install: false
-
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
@@ -51,6 +40,43 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
+      - uses: pnpm/action-setup@v2.0.1
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false
+
+      - name: Install JS deps
+        working-directory: ./browser/
+        run: |
+          pnpm install
+          pnpm run playwright-install
+
+      - name: Make JS assets available for consequent builds
+        uses: actions/cache@v2
+        with:
+          path: ./browser/node_modules
+          key: ${{ runner.os }}-js-deps-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-js-deps-
+
+  e2e:
+    name: End-to-end tests
+    runs-on: ubuntu-latest
+    needs: [build_js]
+    steps:
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0  libayatana-appindicator3-dev
+
+      # Needs to match with build_js cache step
+      - name: Restore Cached Packages
+        uses: actions/cache@v2
+        with:
+          path: ./browser/node_modules
+          key: ${{ runner.os }}-js-deps-${{ hashFiles('**/pnpm-lock.yaml') }}
+
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -60,12 +86,6 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/rust-cache@v1.3.0
 
-      - name: Install JS deps
-        working-directory: ./browser/
-        run: |
-          pnpm install
-          pnpm run playwright-install
-
       - run: rustup component add clippy
       - uses: actions-rs/cargo@v1
         name: cargo clippy