From 1a9404bb7fcbe02c1531e040c419fcb525a786e2 Mon Sep 17 00:00:00 2001
From: Ron de las Alas <ron@scratch.mit.edu>
Date: Wed, 8 Nov 2023 10:08:01 -0500
Subject: [PATCH] ci: try with artifacts

---
 .github/workflows/ci-cd.yml | 48 ++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 470f11d6f2e..c8790cf5270 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -44,24 +44,34 @@ jobs:
               env:
                 cache-name: ${{ secrets.CACHE_NAME }}
               with:
-                # caching node_modules
                 path: 
                     node_modules
+                    src/generated
+                    static/microbit
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
-            - name: Cache microbit
-              id: cache-microbit
-              uses: actions/cache@v3
+            - name: Store Microbit
+              uses: actions/upload-artifact@v3
               with:
-                path: 
-                    static/microbit
-                key: ${{ runner.os }}-microbit-${{ hashFiles('package-lock.json') }}
-            - name: Cache node modules
-              id: cache-generated
-              uses: actions/cache@v3
+                path: static/microbit
+            - name: Store Generated
+              uses: actions/upload-artifact@v3
               with:
-                path: 
-                    src/generated
-                key: ${{ runner.os }}-generated-${{ hashFiles('package-lock.json') }}
+                path: src/generated
+    
+            # - name: Cache microbit
+            #   id: cache-microbit
+            #   uses: actions/cache@v3
+            #   with:
+            #     path: 
+            #         static/microbit
+            #     key: ${{ runner.os }}-microbit-${{ hashFiles('package-lock.json') }}
+            # - name: Cache node modules
+            #   id: cache-generated
+            #   uses: actions/cache@v3
+            #   with:
+            #     path: 
+            #         src/generated
+            #     key: ${{ runner.os }}-generated-${{ hashFiles('package-lock.json') }}
             - name: Install Dependencies
               if: steps.cache-nodemodules.outputs.cache-hit != 'true'
               run: npm ci
@@ -103,10 +113,16 @@ jobs:
               with:
                 cache: "npm"
                 node-version-file: ".nvmrc"
-            - name: Install Dependencies
-              run: npm install
-            - run: npm list
+            - uses: actions/cache@v3
+              with:
+                path: 
+                    node_modules
+                key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+            - name: Download all workflow run artifacts
+              uses: actions/download-artifact@v3
             - run: npm run build
+
+            
             # - name: Setup & Test
             #   run: |
             #       mkdir -p ./test/results