Merge branch 'main' into mikesposito/deps/smart-transaction-controller

Author: mikesposito

.depcheckrc.yml

@@ -28,6 +28,7 @@ ignores:
   - '@metamask/test-dapp'
   - '@metamask/test-dapp-multichain'
   - '@metamask/test-dapp-solana'
+  - '@metamask/snap-simple-keyring-site'
   - '@metamask/design-tokens' # Only imported in index.css
   - '@tsconfig/node22' # required dynamically by TS, used in tsconfig.json
   - '@sentry/cli' # invoked as `sentry-cli`

.github/scripts/check-template-and-add-labels.ts

@@ -183,29 +183,29 @@ async function main(): Promise<void> {
     }
 
   } else if (labelable.type === LabelableType.PullRequest) {
+    // Check changelog entry for all PRs (regardless of template match)
+    const hasNoChangelogLabel = labelable.labels?.some(
+      (label) => label.name === "no-changelog"
+    );
+
+    // Require changelog entry
+    if (hasNoChangelogLabel) {
+      console.log(`PR ${labelable.number} has "no-changelog" label. Skipping changelog entry check.`);
+    } else if (!hasChangelogEntry(labelable.body)) {
+      const errorMessage = `PR is missing a valid "CHANGELOG entry:" line.`;
+      console.log(errorMessage);
+
+      core.setFailed(errorMessage);
+      process.exit(1);
+    }
+
     if (templateType === TemplateType.PullRequest) {
       console.log("PR matches 'pull-request-template.md' template.");
       await removeLabelFromLabelableIfPresent(
         octokit,
         labelable,
         invalidPullRequestTemplateLabel,
       );
-
-      // Skip changelog check if PR has "no-changelog" label
-      const hasNoChangelogLabel = labelable.labels?.some(
-        (label) => label.name === "no-changelog"
-      );
-
-      // Require changelog entry
-      if (hasNoChangelogLabel) {
-        console.log(`PR ${labelable.number} has "no-changelog" label. Skipping changelog entry check.`);
-      } else if (!hasChangelogEntry(labelable.body)) {
-        const errorMessage = `PR is missing a valid "CHANGELOG entry:" line.`;
-        console.log(errorMessage);
-
-        core.setFailed(errorMessage);
-        process.exit(1);
-      }
     } else {
       const errorMessage = `PR body does not match template ('pull-request-template.md').\n\nMake sure PR's body includes all section titles.\n\nSections titles are listed here: https://github.com/MetaMask/metamask-extension/blob/main/.github/scripts/shared/template.ts#L40-L47`;
       console.log(errorMessage);

.github/workflows/auto-create-release-pr.yml

@@ -7,6 +7,7 @@ jobs:
   extract:
     if: ${{ github.ref_type == 'branch' && (startsWith(github.ref, 'refs/heads/Version-v') || startsWith(github.ref, 'refs/heads/release/')) }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     outputs:
       semver: ${{ steps.out.outputs.semver }}
     steps:

.github/workflows/auto-update-pr-targeting-release.yml

@@ -10,6 +10,7 @@ jobs:
   auto-update:
     name: Auto-update
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       YARN_ENABLE_HARDENED_MODE: false

.github/workflows/build-storybook.yml

@@ -10,6 +10,7 @@ jobs:
   build-storybook:
     name: Build storybook
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     env:
       # For a `pull_request` event, the branch is `github.head_ref``.
       # For a `push` event, the branch is `github.ref_name`.

.github/workflows/build-ts-migration-dashboard.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   build-ts-migration-dashboard:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     env:
       # For a `pull_request` event, the branch is `github.head_ref``.
       # For a `push` event, the branch is `github.ref_name`.

.github/workflows/check-attributions.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   check-attributions:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1

.github/workflows/check-pr-labels.yml

@@ -17,6 +17,7 @@ concurrency:
 jobs:
   check-pr-labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     permissions:
       pull-requests: read
 

.github/workflows/check-release-tag.yml

@@ -17,6 +17,7 @@ jobs:
     # Only run on PRs targeting stable
     if: github.base_ref == 'stable'
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     permissions:
       contents: read
       pull-requests: read

.github/workflows/check-template-and-add-labels.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   check-template-and-add-labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     if: ${{ github.event_name != 'merge_group' }} # Skip this step for merge_group events
     steps:
       - name: Checkout and setup environment