Yuki Takei 1 год назад
Родитель
Сommit
06b78a1f43

+ 15 - 37
.github/workflows/ci-app.yml

@@ -34,21 +34,14 @@ jobs:
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
 
 
-      - uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
         with:
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
-          cache-dependency-path: '**/pnpm-lock.yaml'
+          version: 9
 
 
-      - name: Cache/Restore node_modules
-        uses: actions/cache@v4
+      - uses: actions/setup-node@v4
         with:
         with:
-          path: |
-            **/node_modules
-            !**/node_modules/.cache/turbo
-          key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
 
 
       - name: Cache/Restore dist
       - name: Cache/Restore dist
         uses: actions/cache@v4
         uses: actions/cache@v4
@@ -98,21 +91,14 @@ jobs:
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
 
 
-      - uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
         with:
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
-          cache-dependency-path: '**/pnpm-lock.yaml'
+          version: 9
 
 
-      - name: Cache/Restore node_modules
-        uses: actions/cache@v4
+      - uses: actions/setup-node@v4
         with:
         with:
-          path: |
-            **/node_modules
-            !**/node_modules/.cache/turbo
-          key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
 
 
       - name: Cache/Restore dist
       - name: Cache/Restore dist
         uses: actions/cache@v4
         uses: actions/cache@v4
@@ -172,22 +158,14 @@ jobs:
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
 
 
-      - uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
         with:
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
-          cache-dependency-path: '**/pnpm-lock.yaml'
+          version: 9
 
 
-      - name: Cache/Restore node_modules
-        uses: actions/cache@v4
+      - uses: actions/setup-node@v4
         with:
         with:
-          path: |
-            **/node_modules
-            !**/node_modules/.cache/turbo
-          key: node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
-            node_modules-app-devdependencies-${{ runner.OS }}-node${{ matrix.node-version }}-
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
 
 
       - name: Cache/Restore dist
       - name: Cache/Restore dist
         uses: actions/cache@v4
         uses: actions/cache@v4

+ 15 - 36
.github/workflows/ci-slackbot-proxy.yml

@@ -35,21 +35,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Cache/Restore node_modules
-      uses: actions/cache@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('apps/slackbot-proxy/package.json') }}
-        restore-keys: |
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
+        node-version: ${{ matrix.node-version }}
+        cache: 'pnpm'
 
 
     - name: Restore dist
     - name: Restore dist
       uses: actions/cache/restore@v4
       uses: actions/cache/restore@v4
@@ -110,21 +103,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Cache/Restore node_modules
-      uses: actions/cache@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        key: node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('apps/slackbot-proxy/package.json') }}
-        restore-keys: |
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
-          node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
+        node-version: ${{ matrix.node-version }}
+        cache: 'pnpm'
 
 
     - name: Restore dist
     - name: Restore dist
       uses: actions/cache/restore@v4
       uses: actions/cache/restore@v4
@@ -198,11 +184,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: ${{ matrix.node-version }}
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install turbo
     - name: Install turbo
       run: |
       run: |
@@ -214,16 +203,6 @@ jobs:
         rm -rf apps packages
         rm -rf apps packages
         mv out/* .
         mv out/* .
 
 
-    - name: Cache/Restore node_modules
-      id: cache-dependencies
-      uses: actions/cache@v4
-      with:
-        path: |
-          **/node_modules
-        key: node_modules-slackbot-prxy-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-slackbot-proxy-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
-
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |
         pnpm add node-gyp --global
         pnpm add node-gyp --global

+ 5 - 2
.github/workflows/release-slackbot-proxy.yml

@@ -93,11 +93,14 @@ jobs:
       with:
       with:
         ref: ${{ github.event.pull_request.base.ref }}
         ref: ${{ github.event.pull_request.base.ref }}
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: '18'
         node-version: '18'
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |

+ 10 - 24
.github/workflows/release-subpackages.yml

@@ -28,21 +28,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: '20'
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Cache/Restore node_modules
-      id: cache-dependencies
-      uses: actions/cache@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        key: node_modules-release-subpackages-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-release-subpackages-${{ runner.OS }}-node${{ inputs.node-version }}-
+        node-version: '20'
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |
@@ -81,21 +74,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: '20'
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Cache/Restore node_modules
-      id: cache-dependencies
-      uses: actions/cache@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        key: node_modules-release-subpackages-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-release-subpackages-${{ runner.OS }}-node${{ inputs.node-version }}-
+        node-version: '20'
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |

+ 10 - 4
.github/workflows/release.yml

@@ -22,11 +22,14 @@ jobs:
       with:
       with:
         ref: ${{ github.event.pull_request.base.ref }}
         ref: ${{ github.event.pull_request.base.ref }}
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: '20'
         node-version: '20'
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |
@@ -162,11 +165,14 @@ jobs:
       with:
       with:
         ref: v${{ needs.create-github-release.outputs.RELEASED_VERSION }}
         ref: v${{ needs.create-github-release.outputs.RELEASED_VERSION }}
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: '20'
         node-version: '20'
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |

+ 15 - 36
.github/workflows/reusable-app-prod.yml

@@ -26,11 +26,14 @@ jobs:
         # retrieve local font files
         # retrieve local font files
         lfs: true
         lfs: true
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: ${{ inputs.node-version }}
         node-version: ${{ inputs.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install turbo
     - name: Install turbo
       run: |
       run: |
@@ -42,16 +45,6 @@ jobs:
         rm -rf apps packages
         rm -rf apps packages
         mv out/* .
         mv out/* .
 
 
-    - name: Cache/Restore node_modules
-      uses: actions/cache@v4
-      with:
-        path: |
-          **/node_modules
-          !**/node_modules/.cache/turbo
-        key: node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
-
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |
         pnpm add node-gyp --global
         pnpm add node-gyp --global
@@ -137,11 +130,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+
     - uses: actions/setup-node@v4
     - uses: actions/setup-node@v4
       with:
       with:
         node-version: ${{ inputs.node-version }}
         node-version: ${{ inputs.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        cache: 'pnpm'
 
 
     - name: Install turbo
     - name: Install turbo
       run: |
       run: |
@@ -153,16 +149,6 @@ jobs:
         rm -rf apps packages
         rm -rf apps packages
         mv out/* .
         mv out/* .
 
 
-    - name: Restore node_modules
-      uses: actions/cache/restore@v4
-      with:
-        path: |
-          **/node_modules
-        # shared key with build-prod
-        key: node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
-
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |
         pnpm install --prod
         pnpm install --prod
@@ -228,21 +214,14 @@ jobs:
     steps:
     steps:
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: ${{ inputs.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Restore node_modules
-      uses: actions/cache/restore@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        # saved key by build-prod
-        key: node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-app-build-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
+        node-version: ${{ inputs.node-version }}
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |

+ 5 - 12
.github/workflows/reusable-app-reg-suit.yml

@@ -54,21 +54,14 @@ jobs:
         ref: ${{ inputs.checkout-ref }}
         ref: ${{ inputs.checkout-ref }}
         fetch-depth: 0
         fetch-depth: 0
 
 
-    - uses: actions/setup-node@v4
+    - uses: pnpm/action-setup@v4
       with:
       with:
-        node-version: ${{ inputs.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: '**/pnpm-lock.yaml'
+        version: 9
 
 
-    - name: Restore node_modules
-      uses: actions/cache/restore@v4
+    - uses: actions/setup-node@v4
       with:
       with:
-        path: |
-          **/node_modules
-        # saved key by launch-prod
-        key: node_modules-app-launch-prod-${{ runner.OS }}-node${{ inputs.node-version }}-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          node_modules-app-launch-prod-${{ runner.OS }}-node${{ inputs.node-version }}-
+        node-version: ${{ inputs.node-version }}
+        cache: 'pnpm'
 
 
     - name: Install dependencies
     - name: Install dependencies
       run: |
       run: |