From e6b227645097ed86b5a7e9de2746442184317a87 Mon Sep 17 00:00:00 2001
From: Ron de las Alas <ron@scratch.mit.edu>
Date: Wed, 8 Nov 2023 14:35:27 -0500
Subject: [PATCH] ci: test eslint fix

---
 .eslintignore               |  1 +
 .github/workflows/ci-cd.yml | 55 ++++++++++---------------------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 93c033154fb..3251f7fdce2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 node_modules/*
 build/*
 dist/*
+test/*
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index c8790cf5270..04f71bc4b19 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -46,43 +46,19 @@ jobs:
               with:
                 path: 
                     node_modules
-                    src/generated
-                    static/microbit
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
-            - name: Store Microbit
-              uses: actions/upload-artifact@v3
-              with:
-                path: static/microbit
-            - name: Store Generated
-              uses: actions/upload-artifact@v3
-              with:
-                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
-            # - name: Lint
-            #   run: |
-            #     npm run test:lint -- --quiet --output-file test-results/eslint-results.xml --format junit
-            # - name: Store Lint Artifacts
-            #   uses: actions/upload-artifact@v3
-            #   with:
-            #     name: test-output
-            #     path: ./test-results/*
+            - run: mkdirp test/eslint
+            - name: Lint
+              run: |
+                npm run test:lint -- --quiet --output-file test-results/eslint/results.xml
+            - name: Store Lint Artifacts
+              uses: actions/upload-artifact@v3
+              with:
+                name: test-output
+                path: ./test-results/*
     # test-unit:
     #     needs: setup
     #     runs-on: ubuntu-latest
@@ -113,13 +89,12 @@ jobs:
               with:
                 cache: "npm"
                 node-version-file: ".nvmrc"
-            - 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
+            # - uses: actions/cache@v3
+            #   with:
+            #     path: 
+            #         node_modules
+            #     key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+            - run: npm install
             - run: npm run build