fix yarn cache

ShuiyuanSJTU · Sep 4, 2024 · 72a0352 · 72a0352
1 parent d050851
commit 72a0352
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/discourse-plugin.yml b/.github/workflows/discourse-plugin.yml
@@ -23,7 +23,7 @@ on:
         required: false
 
 concurrency:
-  group: discourse-plugin-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  group: discourse-plugin-${{ format('{0}-{1}-{2}', github.head_ref || github.run_number, github.job, inputs.core_ref) }}
   cancel-in-progress: true
 
 jobs:
@@ -146,6 +146,7 @@ jobs:
       PGUSER: discourse
       PGPASSWORD: discourse
       PLUGIN_NAME: ${{ inputs.name || github.event.repository.name }}
+      CHEAP_SOURCE_MAPS: "1"
 
     strategy:
       fail-fast: false
@@ -226,19 +227,20 @@ jobs:
 
       - name: Get yarn cache directory
         id: yarn-cache-dir
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: if [ -f yarn.lock ]; then echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT; fi
 
       - name: Yarn cache
         uses: actions/cache@v4
         id: yarn-cache
+        if: ${{ steps.yarn-cache-dir.outputs.dir }}
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Yarn install
-        run: yarn install
+      - name: Install JS Dependencies
+        run: if [ -f yarn.lock ]; then yarn install; else pnpm install; fi
 
       - name: Fetch app state cache
         uses: actions/cache@v4

diff --git a/.github/workflows/plugin-compacity.yml b/.github/workflows/plugin-compacity.yml
@@ -65,6 +65,7 @@ jobs:
       PGUSER: discourse
       PGPASSWORD: discourse
       USES_PARALLEL_DATABASES: ${{ matrix.build_type == 'backend' || matrix.build_type == 'system' }}
+      CHEAP_SOURCE_MAPS: "1"
 
     strategy:
       fail-fast: false
@@ -138,19 +139,20 @@ jobs:
 
       - name: Get yarn cache directory
         id: yarn-cache-dir
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: if [ -f yarn.lock ]; then echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT; fi
 
       - name: Yarn cache
         uses: actions/cache@v4
         id: yarn-cache
+        if: ${{ steps.yarn-cache-dir.outputs.dir }}
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Yarn install
-        run: yarn install
+      - name: Install JS Dependencies
+        run: if [ -f yarn.lock ]; then yarn install; else pnpm install; fi
 
       - name: Fetch app state cache
         uses: actions/cache@v4