From 668c93bac78c16edc35ac18d1742b069b16f8dd4 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Mon, 26 Jun 2023 13:25:38 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#54578=20(Switch=20f?= =?UTF-8?q?rom=20corepack=20to=20a=20global=20np...)=20into=20release-5.1?= =?UTF-8?q?=20(#54787)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com> --- .github/workflows/ci.yml | 11 +++++++++-- .github/workflows/new-release-branch.yaml | 4 +++- .github/workflows/nightly.yaml | 4 +++- .github/workflows/release-branch-artifact.yaml | 4 +++- .github/workflows/set-version.yaml | 4 +++- .github/workflows/update-package-lock.yaml | 4 +++- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bce28f22e5ad..8a1cf9a02d2ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,9 @@ jobs: node-version: "*" check-latest: true - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version - run: npm ci @@ -147,8 +149,13 @@ jobs: node-version: "*" check-latest: true - run: | - corepack enable npm npm --version + # corepack enable npm + + - run: | + npm install -g $(jq -r '.packageManager' < package.json) + npm --version + working-directory: ./pr - run: npm ci working-directory: ./pr diff --git a/.github/workflows/new-release-branch.yaml b/.github/workflows/new-release-branch.yaml index dcd720a42da4f..e8d56babb6b6e 100644 --- a/.github/workflows/new-release-branch.yaml +++ b/.github/workflows/new-release-branch.yaml @@ -17,7 +17,9 @@ jobs: steps: - uses: actions/setup-node@v3 - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version - uses: actions/checkout@v3 with: diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index e365ad71fda49..25f0dc27df993 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -23,7 +23,9 @@ jobs: # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry. registry-url: https://registry.npmjs.org/ - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version - name: Setup and publish nightly run: | diff --git a/.github/workflows/release-branch-artifact.yaml b/.github/workflows/release-branch-artifact.yaml index 39c4426e27e9b..371074c0a02de 100644 --- a/.github/workflows/release-branch-artifact.yaml +++ b/.github/workflows/release-branch-artifact.yaml @@ -16,7 +16,9 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version - name: npm install and test run: | diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml index 0fc9d58d16706..62142066f8000 100644 --- a/.github/workflows/set-version.yaml +++ b/.github/workflows/set-version.yaml @@ -20,7 +20,9 @@ jobs: with: ref: ${{ github.event.client_payload.branch_name }} - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version # notably, this is essentially the same script as `new-release-branch.yaml` (with fewer inputs), but it assumes the branch already exists # do note that executing the transform below will prevent the `configurePrerelease` script from running on the source, as it makes the diff --git a/.github/workflows/update-package-lock.yaml b/.github/workflows/update-package-lock.yaml index 6bcba20a1ebfe..ce15f65d6819e 100644 --- a/.github/workflows/update-package-lock.yaml +++ b/.github/workflows/update-package-lock.yaml @@ -26,7 +26,9 @@ jobs: with: node-version: 16 - run: | - corepack enable npm + npm --version + # corepack enable npm + npm install -g $(jq -r '.packageManager' < package.json) npm --version - name: Update package-lock.json and push