-
Notifications
You must be signed in to change notification settings - Fork 799
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Due to the end of support for Yarn 1 and several bugs that were impacting our workflows, we realized a need to update the package manager. After discussion and analysis (p9dueE-2MY-p2) we decided to go with pnpm as the replacement. See docs/yarn-upgrade.md for further notes. Other side effects of this PR: * Update a bunch of indirect dependencies. * Add some missing dependencies. * Move the js-test-runner into its own "project", like the Jetpack CLI, so we can remove its deps from the monorepo-root package.json. * Deprecated a bunch of scripts in the monorepo-root package.json. * Our CI now uses the published version of action-required-review.
- Loading branch information
Showing
112 changed files
with
29,061 additions
and
65,197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
6.5.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,10 +20,11 @@ jobs: | |
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Read PHP and Node versions | ||
- name: Read tool versions | ||
id: versions | ||
run: | | ||
echo "::set-output name=php-version::$(<.github/php-version)" | ||
echo "::set-output name=pnpm-version::$(<.github/pnpm-version)" | ||
echo "::set-output name=node-version::$(<.nvmrc)" | ||
- name: Setup PHP | ||
|
@@ -51,16 +52,18 @@ jobs: | |
restore-keys: | | ||
${{ runner.os }}-composer- | ||
- name: Get yarn cache directory path | ||
id: yarn-cache-dir-path | ||
run: echo "::set-output name=dir::$(yarn cache dir)" | ||
- name: Use yarn cache | ||
- name: Use pnpm cache | ||
uses: actions/cache@v2 | ||
with: | ||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
path: ~/.pnpm-store | ||
key: ${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}-${{ hashFiles('**/package.json') }} | ||
restore-keys: | | ||
${{ runner.os }}-yarn- | ||
${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}- | ||
- name: Setup pnpm | ||
uses: pnpm/[email protected] | ||
with: | ||
version: ${{ steps.versions.outputs.pnpm-version }} | ||
|
||
- name: Tool versions | ||
run: | | ||
|
@@ -70,8 +73,8 @@ jobs: | |
composer --version | ||
which node | ||
node --version | ||
which yarn | ||
yarn --version | ||
which pnpm | ||
pnpm --version | ||
which jq | ||
jq --version | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,10 +49,11 @@ jobs: | |
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Read PHP and Node versions | ||
- name: Read tool versions | ||
id: versions | ||
run: | | ||
echo "::set-output name=php-version::$(<.github/php-version)" | ||
echo "::set-output name=pnpm-version::$(<.github/pnpm-version)" | ||
echo "::set-output name=node-version::$(<.nvmrc)" | ||
- name: Setup PHP | ||
|
@@ -80,16 +81,18 @@ jobs: | |
restore-keys: | | ||
${{ runner.os }}-composer- | ||
- name: Get yarn cache directory path | ||
id: yarn-cache-dir-path | ||
run: echo "::set-output name=dir::$(yarn cache dir)" | ||
- name: Use yarn cache | ||
- name: Use pnpm cache | ||
uses: actions/cache@v2 | ||
with: | ||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
path: ~/.pnpm-store | ||
key: ${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}-${{ hashFiles('**/package.json') }} | ||
restore-keys: | | ||
${{ runner.os }}-yarn- | ||
${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}- | ||
- name: Setup pnpm | ||
uses: pnpm/[email protected] | ||
with: | ||
version: ${{ steps.versions.outputs.pnpm-version }} | ||
|
||
- name: Tool versions | ||
run: | | ||
|
@@ -99,25 +102,25 @@ jobs: | |
composer --version | ||
which node | ||
node --version | ||
which yarn | ||
yarn --version | ||
which pnpm | ||
pnpm --version | ||
which jq | ||
jq --version | ||
- name: Build Production Jetpack | ||
run: | | ||
yarn install | ||
yarn jetpack build plugins/jetpack -v --production | ||
pnpm install | ||
pnpx jetpack build plugins/jetpack -v --production | ||
- name: Environment set-up | ||
working-directory: projects/plugins/jetpack/tests/e2e | ||
env: | ||
CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }} | ||
run: | | ||
yarn install | ||
yarn test-decrypt-config | ||
yarn env-start | ||
yarn tunnel-on | ||
pnpm install | ||
pnpm run test-decrypt-config | ||
pnpm run env-start | ||
pnpm run tunnel-on | ||
- name: Set up Gutenberg | ||
if: matrix.group == 'gutenberg' | ||
|
@@ -126,15 +129,15 @@ jobs: | |
|
||
- name: Run ${{ matrix.group }} tests | ||
working-directory: projects/plugins/jetpack/tests/e2e | ||
run: yarn test-e2e --group=${{ matrix.group }} | ||
run: pnpm run test-e2e -- --group=${{ matrix.group }} | ||
|
||
- name: Environment tear-down | ||
if: ${{ always() }} | ||
working-directory: projects/plugins/jetpack/tests/e2e | ||
continue-on-error: true | ||
run: | | ||
yarn tunnel-off | ||
yarn pm2 logs --nostream --lines 10000 > output/logs/tunnel.log | ||
pnpm run tunnel-off | ||
pnpm run pm2 -- logs --nostream --lines 10000 > output/logs/tunnel.log | ||
- name: Upload test artifacts | ||
if: ${{ always() }} | ||
|
@@ -172,9 +175,41 @@ jobs: | |
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Read tool versions | ||
id: versions | ||
run: | | ||
echo "::set-output name=php-version::$(<.github/php-version)" | ||
echo "::set-output name=pnpm-version::$(<.github/pnpm-version)" | ||
echo "::set-output name=node-version::$(<.nvmrc)" | ||
- name: Setup Node | ||
uses: actions/setup-node@v2 | ||
with: | ||
node-version: ${{ steps.versions.outputs.node-version }} | ||
|
||
- name: Use pnpm cache | ||
uses: actions/cache@v2 | ||
with: | ||
path: ~/.pnpm-store | ||
key: ${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}-${{ hashFiles('**/package.json') }} | ||
restore-keys: | | ||
${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}- | ||
- name: Setup pnpm | ||
uses: pnpm/[email protected] | ||
with: | ||
version: ${{ steps.versions.outputs.pnpm-version }} | ||
|
||
- name: Tool versions | ||
run: | | ||
which node | ||
node --version | ||
which pnpm | ||
pnpm --version | ||
- name: Send Slack notification | ||
working-directory: projects/plugins/jetpack/tests/e2e | ||
run: | | ||
yarn install | ||
yarn test-decrypt-config | ||
pnpm install | ||
pnpm run test-decrypt-config | ||
NODE_ENV=test node ./bin/slack.js job ${{needs.e2e-tests.result}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,34 +35,37 @@ jobs: | |
- name: Checkout | ||
uses: actions/checkout@v2 | ||
|
||
- name: Read PHP and Node versions | ||
- name: Read tool versions | ||
id: versions | ||
run: | | ||
echo "::set-output name=php-version::$(<.github/php-version)" | ||
echo "::set-output name=pnpm-version::$(<.github/pnpm-version)" | ||
echo "::set-output name=node-version::$(<.nvmrc)" | ||
- name: Setup Node | ||
uses: actions/setup-node@v2 | ||
with: | ||
node-version: ${{ steps.versions.outputs.node-version }} | ||
|
||
- name: Get yarn cache directory path | ||
id: yarn-cache-dir-path | ||
run: echo "::set-output name=dir::$(yarn cache dir)" | ||
- name: Use yarn cache | ||
- name: Use pnpm cache | ||
uses: actions/cache@v2 | ||
with: | ||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
path: ~/.pnpm-store | ||
key: ${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}-${{ hashFiles('**/package.json') }} | ||
restore-keys: | | ||
${{ runner.os }}-yarn- | ||
${{ runner.os }}-pnpm-${{ steps.versions.outputs.node-version }}- | ||
- name: Setup pnpm | ||
uses: pnpm/[email protected] | ||
with: | ||
version: ${{ steps.versions.outputs.pnpm-version }} | ||
|
||
- name: Tool versions | ||
run: | | ||
which node | ||
node --version | ||
which yarn | ||
yarn --version | ||
which pnpm | ||
pnpm --version | ||
which jq | ||
jq --version | ||
|
Oops, something went wrong.