From 303bc0f94d8f3bb809a1eed14ddcaf15bc915a14 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Sat, 4 Dec 2021 10:46:25 -0600 Subject: [PATCH] Allow publishing on v11-patch branch --- .github/workflows/build_test_deploy.yml | 79 +++++++++++++++++++++++++ lerna.json | 3 +- package.json | 2 +- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index ffc5d87edeacf..c0966826637fa 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -25,6 +25,12 @@ jobs: outputs: docsChange: ${{ steps.docs-change.outputs.DOCS_CHANGE }} steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/checkout@v2 with: fetch-depth: 25 @@ -50,11 +56,18 @@ jobs: runs-on: ubuntu-latest needs: build steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 id: restore-build with: path: ./* key: ${{ github.sha }} + - run: ./scripts/check-manifests.js - run: yarn lint @@ -65,6 +78,12 @@ jobs: env: NEXT_TELEMETRY_DISABLED: 1 steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + # https://github.com/actions/virtual-environments/issues/1187 - name: tune linux network run: sudo ethtool -K eth0 tx off rx off @@ -97,6 +116,12 @@ jobs: NEXT_TEST_JOB: 1 HEADLESS: true steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 if: ${{needs.build.outputs.docsChange != 'docs only change'}} id: restore-build @@ -120,6 +145,12 @@ jobs: matrix: group: [1, 2, 3, 4, 5, 6] steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - run: echo ${{needs.build.outputs.docsChange}} # https://github.com/actions/virtual-environments/issues/1187 @@ -150,6 +181,12 @@ jobs: HEADLESS: true TEST_ELECTRON: 1 steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 if: ${{needs.build.outputs.docsChange != 'docs only change'}} id: restore-build @@ -174,6 +211,12 @@ jobs: NODE_OPTIONS: '--unhandled-rejections=strict' YARN_COMPRESSION_LEVEL: '0' steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 if: ${{needs.build.outputs.docsChange != 'docs only change'}} id: restore-build @@ -202,6 +245,12 @@ jobs: NEXT_PRIVATE_TEST_WEBPACK4_MODE: 1 steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + # https://github.com/actions/virtual-environments/issues/1187 - name: tune linux network run: sudo ethtool -K eth0 tx off rx off @@ -225,6 +274,12 @@ jobs: BROWSER_NAME: 'firefox' NEXT_TELEMETRY_DISABLED: 1 steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 if: ${{needs.build.outputs.docsChange != 'docs only change'}} id: restore-build @@ -246,6 +301,12 @@ jobs: BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }} BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }} steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + # https://github.com/actions/virtual-environments/issues/1187 - name: tune linux network run: sudo ethtool -K eth0 tx off rx off @@ -272,6 +333,12 @@ jobs: BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }} BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }} steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + # https://github.com/actions/virtual-environments/issues/1187 - name: tune linux network run: sudo ethtool -K eth0 tx off rx off @@ -293,6 +360,12 @@ jobs: env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + # https://github.com/actions/virtual-environments/issues/1187 - name: tune linux network run: sudo ethtool -K eth0 tx off rx off @@ -315,6 +388,12 @@ jobs: runs-on: ubuntu-latest needs: [publishRelease] steps: + - name: Setup node + uses: actions/setup-node@v2 + if: ${{ steps.docs-change.outputs.docsChange != 'docs only change' }} + with: + node-version: 14 + - uses: actions/cache@v2 id: restore-build with: diff --git a/lerna.json b/lerna.json index a0249a3ed58d4..89a9d7d2c53c1 100644 --- a/lerna.json +++ b/lerna.json @@ -12,7 +12,8 @@ "npmClient": "npm", "allowBranch": [ "master", - "canary" + "canary", + "v11-patch" ], "registry": "https://registry.npmjs.org/" } diff --git a/package.json b/package.json index abbb81aef8449..8df15b0781c17 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "types": "lerna run types --stream", "typescript": "lerna run typescript", "prepublish": "lerna run prepublish", - "publish-canary": "git checkout canary && git pull && lerna version prerelease --preid canary --force-publish && release --pre --skip-questions", + "publish-canary": "git pull && lerna version prerelease --preid canary --force-publish && release --pre --skip-questions", "publish-stable": "lerna version --force-publish", "lint-staged": "lint-staged", "next-with-deps": "./scripts/next-with-deps.sh",