Merge pull request #164 from bcgov/yj

chore: revert nodejs 20
bcgov · Apr 17, 2024 · 12ccb65 · 12ccb65
2 parents bfbe1ad + a84bfa4
commit 12ccb65
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 44 deletions.
diff --git a/.github/actions/setup-npm/action.yml b/.github/actions/setup-npm/action.yml
@@ -4,23 +4,17 @@ description: Setup required NPM packages
 runs:
   using: composite
   steps:
-    - uses: actions/cache@v3
-      with:
-        path: |
-          **/node_modules
-        key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-npm-
+  - uses: actions/cache@67b839edb68371cc5014f6cea11c9aa77238de78
+    with:
+      path: |
+        **/node_modules
+      key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.lock') }}
 
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
+  - name: Install Root NPM packages
+    run: npm install
+    shell: bash
 
-    - name: Install Root NPM packages
-      run: npm install
-      shell: bash
-
-    - name: Install Frontend NPM packages
-      run: npm install
-      working-directory: ./frontend
-      shell: bash
+  - name: Install Frontend NPM packages
+    run: npm install
+    working-directory: ./frontend
+    shell: bash
diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml
@@ -4,32 +4,26 @@ description: Setup required tools in the workspace
 runs:
   using: composite
   steps:
-    - name: Install asdf
-      uses: asdf-vm/actions/setup@8b8467c5522bb0aea4977082037e4f2956d67e52
+  - name: Install asdf
+    uses: asdf-vm/actions/setup@8b8467c5522bb0aea4977082037e4f2956d67e52
 
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '20'
+  - name: Cache tools
+    uses: actions/cache@67b839edb68371cc5014f6cea11c9aa77238de78
+    with:
+      path: /home/runner/.asdf
+      key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}
 
-    - name: Cache tools
-      uses: actions/cache@v3
-      with:
-        path: /home/runner/.asdf
-        key: ${{ runner.os }}-${{ hashFiles('**/.tool-versions') }}
-        restore-keys: |
-          ${{ runner.os }}-
+  - name: Install required tools
+    run: |
+      cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true
+      asdf plugin-add docker-compose https://github.com/virtualstaticvoid/asdf-docker-compose.git || true
+      asdf plugin-update --all
+      asdf install
+      asdf reshim
+    shell: bash
 
-    - name: Install required tools
-      run: |
-        cat .tool-versions | cut -f 1 -d ' ' | xargs -n 1 asdf plugin-add || true
-        asdf plugin-add docker-compose https://github.com/virtualstaticvoid/asdf-docker-compose.git || true
-        asdf plugin-update --all
-        asdf install
-        asdf reshim
-      shell: bash
-
-    # - name: Install python tools
-    #   run: |
-    #     pip install -r requirements.txt
-    #     asdf reshim
-    #   shell: bash
+  # - name: Install python tools
+  #   run: |
+  #     pip install -r requirements.txt
+  #     asdf reshim
+  #   shell: bash