DEV: Support pnpm for Discourse core

discourse · Sep 1, 2024 · 7d09d62 · 7d09d62
1 parent 9c1472e
commit 7d09d62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/.github/workflows/discourse-plugin.yml b/.github/workflows/discourse-plugin.yml
@@ -219,21 +219,8 @@ jobs:
         if: matrix.build_type == 'backend'
         run: bundle exec ruby script/i18n_lint.rb "plugins/${{ env.PLUGIN_NAME }}/locales/{client,server}.en.yml"
 
-      - name: Get yarn cache directory
-        id: yarn-cache-dir
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: Yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache
-        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: $(test -f yarn.lock && echo yarn || echo pnpm) install
 
       - name: Fetch app state cache
         uses: actions/cache@v4

diff --git a/.github/workflows/discourse-theme.yml b/.github/workflows/discourse-theme.yml
@@ -201,21 +201,8 @@ jobs:
       - name: Lint English locale
         run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
 
-      - name: Get yarn cache directory
-        id: yarn-cache-dir
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: Yarn cache
-        uses: actions/cache@v4
-        id: yarn-cache
-        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: $(test -f yarn.lock && echo yarn || echo pnpm) install
 
       - name: Fetch app state cache
         uses: actions/cache@v4