From 9474c88b41641e8d0be133356e2044d50444d242 Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Sat, 23 Aug 2025 12:31:04 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=A7=20Update=20settings=20for=20pn?= =?UTF-8?q?pm/action-setup=20(#2472)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd3cd69d3..a6eb13aec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,23 +28,27 @@ jobs: strategy: matrix: - node-version: [22.x] + node-version: [22] steps: - name: Check out Git repository uses: actions/checkout@v5 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: 'pnpm' + - name: Setup pnpm + uses: pnpm/action-setup@v4 + with: + # Auto-detect pnpm version from package.json (requires packageManager in package.json) + package_json_path: './package.json' + run_install: false + - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm build @@ -74,9 +78,6 @@ jobs: - name: Check out Git repository uses: actions/checkout@v5 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - - name: Setup Node.js uses: actions/setup-node@v4 with: @@ -84,8 +85,15 @@ jobs: check-latest: true cache: 'pnpm' + - name: Setup pnpm + uses: pnpm/action-setup@v4 + with: + # Auto-detect pnpm version from package.json (requires packageManager in package.json) + package_json_path: './package.json' + run_install: false + - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm build @@ -121,9 +129,6 @@ jobs: - name: Check out Git repository uses: actions/checkout@v5 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - - name: Setup Node.js uses: actions/setup-node@v4 with: @@ -131,8 +136,15 @@ jobs: check-latest: true cache: 'pnpm' + - name: Setup pnpm + uses: pnpm/action-setup@v4 + with: + # Auto-detect pnpm version from package.json (requires packageManager in package.json) + package_json_path: './package.json' + run_install: false + - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm build From ac1a28ea28d8de263d1a7ef9ea36e104d15232c3 Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Sat, 23 Aug 2025 12:40:35 +0000 Subject: [PATCH 2/4] :bug: Try to fix errors for CI (#2500) --- .github/workflows/ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6eb13aec..fd9e8dead 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,12 +34,6 @@ jobs: - name: Check out Git repository uses: actions/checkout@v5 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - cache: 'pnpm' - - name: Setup pnpm uses: pnpm/action-setup@v4 with: @@ -47,6 +41,12 @@ jobs: package_json_path: './package.json' run_install: false + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + cache: 'pnpm' + - name: Install dependencies run: pnpm install --frozen-lockfile @@ -78,13 +78,6 @@ jobs: - name: Check out Git repository uses: actions/checkout@v5 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: 22 - check-latest: true - cache: 'pnpm' - - name: Setup pnpm uses: pnpm/action-setup@v4 with: @@ -92,6 +85,13 @@ jobs: package_json_path: './package.json' run_install: false + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + check-latest: true + cache: 'pnpm' + - name: Install dependencies run: pnpm install --frozen-lockfile @@ -129,13 +129,6 @@ jobs: - name: Check out Git repository uses: actions/checkout@v5 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: 22 - check-latest: true - cache: 'pnpm' - - name: Setup pnpm uses: pnpm/action-setup@v4 with: @@ -143,6 +136,13 @@ jobs: package_json_path: './package.json' run_install: false + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + check-latest: true + cache: 'pnpm' + - name: Install dependencies run: pnpm install --frozen-lockfile From 723a1d80f2def07802873d0e720cd98980e62bab Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Sat, 23 Aug 2025 12:58:02 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=A7=20Update=20settings=20for=20pn?= =?UTF-8?q?pm=20(#2500)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd9e8dead..90fc291b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,8 @@ # See: # https://docs.github.com/en/actions/guides/building-and-testing-nodejs#building-and-testing-your-code # https://pnpm.io/ja/continuous-integration#github-actions +# https://github.com/pnpm/action-setup/issues/99#issuecomment-1918361558 +# https://github.com/actions/setup-node#inputs # https://vercel.com/guides/how-can-i-use-github-actions-with-vercel # https://zenn.dev/ttskch/articles/691fb62fbb6b1b # https://vercel.com/guides/set-up-a-staging-environment-on-vercel @@ -8,7 +10,6 @@ # https://vercel.com/docs/cli/global-options#scope # https://www.prisma.io/docs/orm/prisma-client/deployment/deploy-database-changes-with-prisma-migrate # https://www.prisma.io/docs/orm/prisma-migrate/workflows/baselining -# https://github.com/pnpm/action-setup/issues/99#issuecomment-1918361558 name: CI env: @@ -38,17 +39,19 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: './package.json' + package_json_path: package.json run_install: false - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + check-latest: true cache: 'pnpm' + cache-dependency-path: pnpm-lock.yaml - name: Install dependencies - run: pnpm install --frozen-lockfile + run: pnpm install - name: Build run: pnpm build @@ -82,7 +85,7 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: './package.json' + package_json_path: package.json run_install: false - name: Setup Node.js @@ -91,9 +94,10 @@ jobs: node-version: 22 check-latest: true cache: 'pnpm' + cache-dependency-path: pnpm-lock.yaml - name: Install dependencies - run: pnpm install --frozen-lockfile + run: pnpm install - name: Build run: pnpm build @@ -133,7 +137,7 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: './package.json' + package_json_path: package.json run_install: false - name: Setup Node.js @@ -142,9 +146,10 @@ jobs: node-version: 22 check-latest: true cache: 'pnpm' + cache-dependency-path: pnpm-lock.yaml - name: Install dependencies - run: pnpm install --frozen-lockfile + run: pnpm install - name: Build run: pnpm build From bd762ff689400d675428daa04829094556e9a535 Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Sat, 23 Aug 2025 13:00:22 +0000 Subject: [PATCH 4/4] :pencil2: Fix typo (#2500) --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90fc291b4..d2054d6ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: package.json + package_json_file: package.json run_install: false - name: Use Node.js ${{ matrix.node-version }} @@ -85,7 +85,7 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: package.json + package_json_file: package.json run_install: false - name: Setup Node.js @@ -137,7 +137,7 @@ jobs: uses: pnpm/action-setup@v4 with: # Auto-detect pnpm version from package.json (requires packageManager in package.json) - package_json_path: package.json + package_json_file: package.json run_install: false - name: Setup Node.js