ci: pin pnpm version, upgrade CI scripts

shikijs · Aug 31, 2023 · e6d5417 · e6d5417
1 parent f583c8f
commit e6d5417
Show file tree

Hide file tree

Showing 6 changed files with 1,337 additions and 1,306 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,21 +19,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
 
       - name: pnpm setup
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 7.17.0
-          run_install: true
-
-      - name: cache pnpm modules
-        uses: actions/cache@v3
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
+        uses: pnpm/action-setup@v2
 
       - name: Install dependencies
         run: pnpm install

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,5 +1,5 @@
 name: Deploy npm modules
-on:
+on: {}
   # push:
   #   branches: [main]
 
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: lts/*
 
       - name: cache pnpm modules
         uses: actions/cache@v3
@@ -22,10 +22,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: pnpm setup
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 7.17.0
-          run_install: true
+        uses: pnpm/action-setup@v2
 
       - run: pnpm run update
       - run: pnpm run build

diff --git a/.github/workflows/update-grammars.yml b/.github/workflows/update-grammars.yml
@@ -10,24 +10,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
-
-      - name: cache pnpm modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
+          node-version: lts/*
 
       - name: pnpm setup
-        uses: pnpm/action-setup@v2.1.0
-        with:
-          version: 6.31.0
-          run_install: true
+        uses: pnpm/action-setup@v2
 
       - run: pnpm run update:grammars
 

diff --git a/.github/workflows/update-themes.yml b/.github/workflows/update-themes.yml
@@ -10,24 +10,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
-
-      - name: cache pnpm modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-
+          node-version: lts/*
 
       - name: pnpm setup
-        uses: pnpm/action-setup@v2.1.0
-        with:
-          version: 6.31.0
-          run_install: true
+        uses: pnpm/action-setup@v2
 
       - run: pnpm run update:themes
 

diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "private": true,
+  "packageManager": "pnpm@8.6.1",
   "scripts": {
     "build": "pnpm -r build",
     "dev": "pnpm -r --parallel watch",