.eslintrc.js

@@ -25,4 +25,18 @@ module.exports = {
       },
     },
   ],
+  rules: {
+    'no-restricted-properties': [2,
+      {
+        object: `semver`,
+        property: `validRange`,
+        message: `Use 'semverUtils.validRange' instead`,
+      },
+      {
+        object: `semver`,
+        property: `Range`,
+        message: `Use 'semverUtils.validRange' instead`,
+      },
+    ],
+  },
 };

.github/workflows/integration-workflow.yml

@@ -6,6 +6,13 @@ on:
   pull_request:
   merge_group:
 
+concurrency:
+  # group by workflow and ref; the last slightly strange component ensures that for pull
+  # requests, we limit to 1 concurrent job, but for the master branch we don't
+  group: ${{github.workflow}}-${{github.ref}}-${{github.ref != 'refs/heads/master' || github.run_number}}
+  # Cancel intermediate builds, but only if it is a pull request build.
+  cancel-in-progress: ${{startsWith(github.ref, 'refs/pull/')}}
+
 name: 'Integration'
 jobs:
   chore:
@@ -190,17 +197,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node:
-        - 12
-        - 14
-        - 16
-        - 17
-        platform:
-        - ubuntu-latest
-        - windows-latest
-        - macos-latest
-
-    name: '${{matrix.platform}} w/ Node.js ${{matrix.node}}.x'
+        # We run the ubuntu tests on multiple Node versions with 2 shards since they're the fastest.
+        node: [12, 14, 16, 18]
+        platform: [ubuntu-latest]
+        shard: ['1/2', '2/2']
+        # We run the rest of the tests on the minimum Node version we support with 3 shards.
+        include:
+          # Windows tests
+          - {node: 12, platform: windows-latest, shard: 1/3}
+          - {node: 12, platform: windows-latest, shard: 2/3}
+          - {node: 12, platform: windows-latest, shard: 3/3}
+          # macOS tests
+          - {node: 12, platform: macos-latest, shard: 1/3}
+          - {node: 12, platform: macos-latest, shard: 2/3}
+          - {node: 12, platform: macos-latest, shard: 3/3}
+
+    name: '${{matrix.platform}} w/ Node.js ${{matrix.node}}.x (${{matrix.shard}})'
     runs-on: ${{matrix.platform}}
     needs: build
 
@@ -219,7 +231,7 @@ jobs:
 
     - name: 'Run the integration tests'
       run: |
-        node ./scripts/run-yarn.js test:integration --maxWorkers=100%
+        node ./scripts/run-yarn.js test:integration --maxWorkers=100% --shard=${{matrix.shard}}
       shell: bash
 
     - name: 'Run the unit tests'

.github/workflows/release-branch.yml

@@ -1,10 +1,5 @@
 on:
   workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch?'
-        required: true
-        default: 'cherry-pick/'
 
 name: 'Release Branch'
 jobs:
@@ -18,7 +13,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        ref: ${{github.event.inputs.branch}}
         token: ${{secrets.YARNBOT_TOKEN}}
 
     - name: 'Retrieve all the relevant tags'
@@ -60,7 +54,7 @@ jobs:
         git push --follow-tags
 
         if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then
-          GH_TOKEN="${{secrets.YARNBOT_TOKEN}}" gh release create "@yarnpkg/cli/$NEW_VERSION" --title "v$NEW_VERSION" --verify-tag --generate-notes --notes-start-tag "@yarnpkg/cli/$OLD_VERSION"
+          GH_TOKEN="${{secrets.YARNBOT_TOKEN}}" gh release create "@yarnpkg/cli/$NEW_VERSION" --title "v$NEW_VERSION" --verify-tag --generate-notes --notes-start-tag "@yarnpkg/cli/$OLD_VERSION" --latest=false
         fi
 
     - name: 'Upload the releases'
@@ -69,22 +63,3 @@ jobs:
         yarn config set -H 'npmRegistries["//npm.pkg.github.com"].npmAuthToken' "${{secrets.YARNBOT_TOKEN}}"
         ./scripts/release/02-release-builds.sh
         ./scripts/release/03-release-npm.sh
-
-    - name: 'Updates the stableVersion field'
-      run: |
-        # Revert the change from "Build a binary for convenience"
-        git update-index --no-skip-worktree -- .yarnrc.yml
-        git checkout HEAD -- .yarnrc.yml
-
-        RELEASE_COMMIT=$(git rev-parse HEAD)
-        node ./scripts/stable-versions-store.js
-        git fetch origin master
-        git checkout master
-        node ./scripts/stable-versions-restore.js
-        HEAD_COMMIT=$(git rev-parse HEAD)
-
-        git reset --soft $HEAD_COMMIT
-        git checkout $RELEASE_COMMIT -- packages/*/bin/**
-        git add .
-        git commit -m 'Sync master with the changes from ${{github.event.inputs.branch}}'
-        git push