Merge branch 'main' of https://github.com/microsoft/rushstack into us…

…er/danade/PreventAmbiguousAbbreviations
microsoft · Oct 27, 2023 · d0c28e5 · d0c28e5
2 parents 0a7dd4a + 1f101e6
commit d0c28e5
Show file tree

Hide file tree

Showing 25 changed files with 278 additions and 107 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,15 +11,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - NodeVersion: 16
+          - NodeVersion: 16.20.x
+            NodeVersionDisplayName: 16
             OS: ubuntu-latest
-          - NodeVersion: 18
+          - NodeVersion: 18.18.x
+            NodeVersionDisplayName: 18
             OS: ubuntu-latest
-          - NodeVersion: 20
+          - NodeVersion: 20.9.x
+            NodeVersionDisplayName: 20
             OS: ubuntu-latest
-          - NodeVersion: 18
+          - NodeVersion: 18.18.x
+            NodeVersionDisplayName: 18
             OS: windows-latest
-    name: Node.js v${{ matrix.NodeVersion }} (${{ matrix.OS }})
+    name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }})
     runs-on: ${{ matrix.OS }}
     steps:
       - uses: actions/checkout@v3

diff --git a/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml b/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml
@@ -7,9 +7,6 @@ services:
     ports:
       - '9000:9000'
       - '9001:9001'
-    environment:
-      MINIO_ROOT_USER: minio
-      MINIO_ROOT_PASSWORD: minio123
     healthcheck:
       test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
       interval: 30s

diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts b/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts
@@ -10,7 +10,7 @@ import { OperationStatus, type ICobuildContext, RushSession } from '@microsoft/r
 
 const options: IRedisCobuildLockProviderOptions = {
   url: 'redis://localhost:6379',
-  password: 'redis123'
+  password: 'redis123' // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Password used in unit test.")]
 };
 
 const rushSession: RushSession = new RushSession({

diff --git a/common/changes/@microsoft/rush/1es-templates_2023-10-24-00-46.json b/common/changes/@microsoft/rush/1es-templates_2023-10-24-00-46.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@microsoft/rush/dmyers-shrinkwrap-filename_2023-10-18-19-31.json b/common/changes/@microsoft/rush/dmyers-shrinkwrap-filename_2023-10-18-19-31.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Include the filename of the shrinkwrap file in logging messages for all package managers, not just Yarn.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/common/changes/@microsoft/rush/sanjaiyan-async-concurrent_2023-10-20-07-32.json b/common/changes/@microsoft/rush/sanjaiyan-async-concurrent_2023-10-20-07-32.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "performance improvements by running asynchronous code concurrently using Promise.all",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/common/config/azure-pipelines/npm-publish-rush.yaml b/common/config/azure-pipelines/npm-publish-rush.yaml
@@ -1,41 +1,60 @@
-pool:
-  vmImage: 'ubuntu-latest'
-
 variables:
   - name: FORCE_COLOR
     value: 1
   - name: SourceBranch
     value: $[ replace(replace(resources.repositories.self.ref, 'refs/heads/', ''), 'refs/pull/', 'refs/remotes/pull/') ]
 
-steps:
-  - checkout: self
-    persistCredentials: true
-
-  - template: templates/install-node.yaml
-
-  - template: templates/build.yaml
-
-  - template: templates/bump-versions.yaml
-    parameters:
-      VersionPolicyName: noRush
-      BranchName: $(SourceBranch)
-
-  - template: templates/bump-versions.yaml
-    parameters:
-      VersionPolicyName: rush
-      BranchName: $(SourceBranch)
-
-  - script: 'node libraries/rush-lib/scripts/plugins-prepublish.js'
-    displayName: 'Prepublish workaround for rush-lib'
-
-  - template: templates/publish.yaml
-    parameters:
-      VersionPolicyName: noRush
-      BranchName: $(SourceBranch)
-
-  - template: templates/publish.yaml
-    parameters:
-      VersionPolicyName: rush
-      BranchName: $(SourceBranch)
-
-  - template: templates/record-published-versions.yaml
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      os: windows
+    stages:
+      - stage:
+        jobs:
+          - job:
+            templateContext:
+              outputs:
+                - output: pipelineArtifact
+                  targetPath: $(Build.ArtifactStagingDirectory)/published-versions
+                  artifactName: published-versions
+            steps:
+              - checkout: self
+                persistCredentials: true
+
+              - template: /common/config/azure-pipelines/templates/install-node.yaml@self
+
+              - template: /common/config/azure-pipelines/templates/build.yaml@self
+
+              - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self
+                parameters:
+                  VersionPolicyName: noRush
+                  BranchName: $(SourceBranch)
+
+              - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self
+                parameters:
+                  VersionPolicyName: rush
+                  BranchName: $(SourceBranch)
+
+              - script: 'node libraries/rush-lib/scripts/plugins-prepublish.js'
+                displayName: 'Prepublish workaround for rush-lib'
+
+              - template: /common/config/azure-pipelines/templates/publish.yaml@self
+                parameters:
+                  VersionPolicyName: noRush
+                  BranchName: $(SourceBranch)
+
+              - template: /common/config/azure-pipelines/templates/publish.yaml@self
+                parameters:
+                  VersionPolicyName: rush
+                  BranchName: $(SourceBranch)
+
+              - template: /common/config/azure-pipelines/templates/record-published-versions.yaml@self
diff --git a/common/config/azure-pipelines/npm-publish.yaml b/common/config/azure-pipelines/npm-publish.yaml
@@ -1,28 +1,47 @@
-pool:
-  vmImage: 'ubuntu-latest'
-
 variables:
   - name: FORCE_COLOR
     value: 1
   - name: SourceBranch
     value: $[ replace(replace(resources.repositories.self.ref, 'refs/heads/', ''), 'refs/pull/', 'refs/remotes/pull/') ]
 
-steps:
-  - checkout: self
-    persistCredentials: true
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      os: windows
+    stages:
+      - stage:
+        jobs:
+          - job:
+            templateContext:
+              outputs:
+                - output: pipelineArtifact
+                  targetPath: $(Build.ArtifactStagingDirectory)/published-versions
+                  artifactName: published-versions
+            steps:
+              - checkout: self
+                persistCredentials: true
 
-  - template: templates/install-node.yaml
+              - template: /common/config/azure-pipelines/templates/install-node.yaml@self
 
-  - template: templates/build.yaml
+              - template: /common/config/azure-pipelines/templates/build.yaml@self
 
-  - template: templates/bump-versions.yaml
-    parameters:
-      VersionPolicyName: noRush
-      BranchName: $(SourceBranch)
+              - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self
+                parameters:
+                  VersionPolicyName: noRush
+                  BranchName: $(SourceBranch)
 
-  - template: templates/publish.yaml
-    parameters:
-      VersionPolicyName: noRush
-      BranchName: $(SourceBranch)
+              - template: /common/config/azure-pipelines/templates/publish.yaml@self
+                parameters:
+                  VersionPolicyName: noRush
+                  BranchName: $(SourceBranch)
 
-  - template: templates/record-published-versions.yaml
+              - template: /common/config/azure-pipelines/templates/record-published-versions.yaml@self
diff --git a/common/config/azure-pipelines/templates/record-published-versions.yaml b/common/config/azure-pipelines/templates/record-published-versions.yaml
@@ -1,6 +1,7 @@
 steps:
   - script: 'node repo-scripts/repo-toolbox/lib/start.js record-versions --out-file $(Build.ArtifactStagingDirectory)/published-versions/published-versions.json'
     displayName: 'Record Published Versions'
-  - publish: $(Build.ArtifactStagingDirectory)/published-versions
-    artifact: published-versions
-    displayName: 'Publish Artifact: published-versions'
+  # Published by the 1ES template
+  # - publish: $(Build.ArtifactStagingDirectory)/published-versions
+  #   artifact: published-versions
+  #   displayName: 'Publish Artifact: published-versions'
diff --git a/common/config/azure-pipelines/vscode-extension-publish.yaml b/common/config/azure-pipelines/vscode-extension-publish.yaml
@@ -1,28 +1,42 @@
-pool:
-  vmImage: 'ubuntu-latest'
-
 variables:
   - name: FORCE_COLOR
     value: 1
 
-steps:
-  - checkout: self
-    persistCredentials: true
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      os: windows
+    stages:
+      - stage:
+        jobs:
+          - job:
+            steps:
+              - checkout: self
+                persistCredentials: true
 
-  - template: templates/install-node.yaml
+              - template: /common/config/azure-pipelines/templates/install-node.yaml@self
 
-  - template: templates/build.yaml
-    parameters:
-      BuildParameters: >
-        --to rushstack
-      PerformValidation: false
+              - template: /common/config/azure-pipelines/templates/build.yaml@self
+                parameters:
+                  BuildParameters: >
+                    --to rushstack
+                  PerformValidation: false
 
-  - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js package
-    workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension
-    displayName: 'Package vscode extension'
+              - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js package
+                workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension
+                displayName: 'Package vscode extension'
 
-  - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js deploy
-    workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension
-    displayName: 'Publish vscode extension'
-    env:
-      VSCE_PAT: $(vscePat)
+              - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js deploy
+                workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension
+                displayName: 'Publish vscode extension'
+                env:
+                  VSCE_PAT: $(vscePat)
diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-jest-plugin",
   "entries": [
+    {
+      "version": "0.10.1",
+      "tag": "@rushstack/heft-jest-plugin_v0.10.1",
+      "date": "Thu, 26 Oct 2023 00:27:48 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Add an option (`enableNodeEnvManagement`) to ensure that the NODE_ENV environment variable is set to `\"test\"` during test execution."
+          }
+        ]
+      }
+    },
     {
       "version": "0.10.0",
       "tag": "@rushstack/heft-jest-plugin_v0.10.0",

diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-jest-plugin
 
-This log was last generated on Mon, 23 Oct 2023 15:18:38 GMT and should not be manually modified.
+This log was last generated on Thu, 26 Oct 2023 00:27:48 GMT and should not be manually modified.
+
+## 0.10.1
+Thu, 26 Oct 2023 00:27:48 GMT
+
+### Patches
+
+- Add an option (`enableNodeEnvManagement`) to ensure that the NODE_ENV environment variable is set to `"test"` during test execution.
 
 ## 0.10.0
 Mon, 23 Oct 2023 15:18:38 GMT

diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-jest-plugin",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Heft plugin for Jest",
   "repository": {
     "type": "git",