From 6c68e99f6dfb26aaaef96e270d4c099d4a23b74d Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Wed, 3 Jul 2024 16:35:43 -0700 Subject: [PATCH 1/2] ci: fix pnpm setup --- .github/workflows/compressed-size-action.yml | 4 +--- .github/workflows/lint-and-type.yml | 4 +--- .github/workflows/publish.yml | 4 +--- .github/workflows/test-multiple-builds.yml | 4 +--- .github/workflows/test-multiple-versions.yml | 8 ++------ .github/workflows/test-old-typescript.yml | 4 +--- 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/compressed-size-action.yml b/.github/workflows/compressed-size-action.yml index ee5c4d9508..0899b3feea 100644 --- a/.github/workflows/compressed-size-action.yml +++ b/.github/workflows/compressed-size-action.yml @@ -9,9 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/lint-and-type.yml b/.github/workflows/lint-and-type.yml index 5ab4145414..fbe4ec5111 100644 --- a/.github/workflows/lint-and-type.yml +++ b/.github/workflows/lint-and-type.yml @@ -11,9 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5899536152..a7cace7bd4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,9 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/test-multiple-builds.yml b/.github/workflows/test-multiple-builds.yml index cdf3ae9fcd..020ab52ee3 100644 --- a/.github/workflows/test-multiple-builds.yml +++ b/.github/workflows/test-multiple-builds.yml @@ -16,9 +16,7 @@ jobs: env: [development, production] steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/test-multiple-versions.yml b/.github/workflows/test-multiple-versions.yml index 18ded0049c..68fded30e2 100644 --- a/.github/workflows/test-multiple-versions.yml +++ b/.github/workflows/test-multiple-versions.yml @@ -11,9 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 @@ -56,9 +54,7 @@ jobs: react: 16.8.0 steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 diff --git a/.github/workflows/test-old-typescript.yml b/.github/workflows/test-old-typescript.yml index 47ced5849d..cc01eb47a4 100644 --- a/.github/workflows/test-old-typescript.yml +++ b/.github/workflows/test-old-typescript.yml @@ -29,9 +29,7 @@ jobs: - 4.1.5 steps: - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 - with: - version: 8.2.0 + - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v3 with: node-version: 18 From b34c2a2dff972c452601c6e77cc956da3f2562cd Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Mon, 8 Jul 2024 16:07:16 -0700 Subject: [PATCH 2/2] ci: update --- .github/workflows/compressed-size-action.yml | 4 ++-- .github/workflows/lint-and-type.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- .github/workflows/test-multiple-builds.yml | 4 ++-- .github/workflows/test-multiple-versions.yml | 8 ++++---- .github/workflows/test-old-typescript.yml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/compressed-size-action.yml b/.github/workflows/compressed-size-action.yml index 0899b3feea..5881bb2044 100644 --- a/.github/workflows/compressed-size-action.yml +++ b/.github/workflows/compressed-size-action.yml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/lint-and-type.yml b/.github/workflows/lint-and-type.yml index fbe4ec5111..acdc5bed7d 100644 --- a/.github/workflows/lint-and-type.yml +++ b/.github/workflows/lint-and-type.yml @@ -10,9 +10,9 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a7cace7bd4..b6f9ef0cc9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,9 +8,9 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/test-multiple-builds.yml b/.github/workflows/test-multiple-builds.yml index 020ab52ee3..2a53a4211c 100644 --- a/.github/workflows/test-multiple-builds.yml +++ b/.github/workflows/test-multiple-builds.yml @@ -15,9 +15,9 @@ jobs: build: [cjs, esm, umd] env: [development, production] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/test-multiple-versions.yml b/.github/workflows/test-multiple-versions.yml index 68fded30e2..3f61e54010 100644 --- a/.github/workflows/test-multiple-versions.yml +++ b/.github/workflows/test-multiple-versions.yml @@ -10,9 +10,9 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm' @@ -53,9 +53,9 @@ jobs: - devtools-skip: CI-MATRIX-NOSKIP react: 16.8.0 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm' diff --git a/.github/workflows/test-old-typescript.yml b/.github/workflows/test-old-typescript.yml index cc01eb47a4..8cbf93dfe8 100644 --- a/.github/workflows/test-old-typescript.yml +++ b/.github/workflows/test-old-typescript.yml @@ -28,9 +28,9 @@ jobs: - 4.2.3 - 4.1.5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 cache: 'pnpm'