Merge master into feature/emr

Author: aws-toolkit-automation

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,5 +8,4 @@
 
 - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
 - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
-
-License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
+- License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/lintcommit.js

@@ -130,6 +130,7 @@ Invalid pull request title: \`${title}\`
     * scope: lowercase, <30 chars
     * subject: must be <100 chars
     * documentation: https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title
+* Hint: *close and re-open the PR* to re-trigger CI (after fixing the PR title).
 `
         : `Pull request title matches the [expected format](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title).`
 

.github/workflows/node.js.yml

@@ -7,15 +7,10 @@ on:
     push:
         branches: [master, staging]
     pull_request:
-        branches: [master, feature/*, staging]
-        # Default = opened + synchronize + reopened.
-        # We also want "edited" so that lint-commits runs when PR title is updated.
+        # By default, CI will trigger on opened/synchronize/reopened event types.
         # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
-        types:
-            - edited
-            - opened
-            - reopened
-            - synchronize
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
+        branches: [master, feature/*, staging]
 
 # Cancel old jobs when a pull request is updated.
 concurrency:
@@ -24,6 +19,7 @@ concurrency:
 
 jobs:
     lint-commits:
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4

.github/workflows/notification.yml

@@ -6,15 +6,10 @@ name: Notifications
 on:
     # `pull_request_target` (as opposed to `pull_request`) gives permissions to comment on PRs.
     pull_request_target:
-        branches: [master, feature/*, staging]
-        # Default = opened + synchronize + reopened.
-        # We also want "edited" so that changelog notifications runs when PR title is updated.
+        # By default, CI will trigger on opened/synchronize/reopened event types.
         # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
-        types:
-            - edited
-            - opened
-            - reopened
-            - synchronize
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
+        branches: [master, feature/*, staging]
 
 # Cancel old jobs when a pull request is updated.
 concurrency:

packages/core/src/testInteg/codecatalyst/devEnv.test.ts

@@ -141,7 +141,12 @@ describe('InactivityMessage', function () {
                 message: expectedMessages[i][0],
                 minute: expectedMessages[i][1],
             }
-            assert.deepStrictEqual(actualMessages[i], expected)
+            assert.deepStrictEqual(actualMessages[i].message, expected.message)
+            // Avoid flakiness in the timing by looking within a minute rather than exact.
+            assert.ok(
+                Math.abs(actualMessages[i].minute - expected.minute) <= 1,
+                `Expected to be within 60 seconds of minute ${expected.minute}, but instead was at minute ${actualMessages[i].minute}`
+            )
         }
     }