DEV: Support pnpm for Discourse core (#147)

See discourse/discourse#28671
discourse · Sep 2, 2024 · f7f4895 · f7f4895
1 parent 9c1472e
commit f7f4895
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/discourse-plugin.yml b/.github/workflows/discourse-plugin.yml
@@ -221,19 +221,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/discourse-theme.yml b/.github/workflows/discourse-theme.yml
@@ -203,19 +203,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