Merge branch 'master' into geo-charts

Author: JCQuintas

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  code-infra: https://raw.githubusercontent.com/mui/mui-public/35aa25ced2bc6ff4f6c5266b073a0a725a362785/.circleci/orbs/code-infra.yml
+  code-infra: https://raw.githubusercontent.com/mui/mui-public/023c96ed6ca37cdb1ff687787e61257c0960285a/.circleci/orbs/code-infra.yml
 
 parameters:
   browserstack-force:
@@ -57,6 +57,7 @@ default-job: &default-job
     BASE_BRANCH: master
   working_directory: /tmp/mui
   executor: code-infra/mui-node
+  resource_class: medium
 # CircleCI has disabled the cache across forks for security reasons.
 # Following their official statement, it was a quick solution, they
 # are working on providing this feature back with appropriate security measures.
@@ -276,7 +277,6 @@ jobs:
     executor:
       name: code-infra/mui-node-browser
       playwright-img-version: v1.60.0-noble
-    resource_class: medium
     steps:
       - checkout
       - run:

.github/workflows/ci.yml

@@ -15,4 +15,4 @@ jobs:
     name: Continuous releases
     uses: mui/mui-public/.github/workflows/ci-base.yml@8b0badde3f4948db33af81129bf69b51a619aa3a # master
     with:
-      node-version: '22.18.0'
+      node-version: '22.22.3'

.github/workflows/l10n.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Use Node.js 22.x
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: 22.18.0
+          node-version: '22.22.3'
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
       - run: pnpm install --frozen-lockfile
       - name: pnpm l10n --report

netlify.toml

@@ -6,7 +6,7 @@
   command = "pnpm docs:build"
 
 [build.environment]
-  NODE_VERSION = "22.18"
+  NODE_VERSION = "22.22.3"
   PNPM_FLAGS = "--frozen-lockfile"
   NODE_OPTIONS = "--max-old-space-size=6144"
 

scripts/changelogUtils.mjs

@@ -626,10 +626,11 @@ ${logOtherSection({
  * Fetches and returns the latest tagged version for a given major version.
  * @param {string | undefined} majorVersion
  */
-async function findLatestTaggedVersionForMajor(majorVersion) {
+async function findLatestTaggedVersionForMajor(majorVersion, upstreamRemote = 'origin') {
   // Fetch all tags from all remotes to ensure we have the latest tags.
   await $`git fetch --tags --all`;
-  const { stdout } = await $`git describe --tags --abbrev=0 --match ${`v${majorVersion || ''}*`}`; // only include "version-tags"
+  const { stdout } =
+    await $`git describe --tags --abbrev=0 --match ${`v${majorVersion || ''}*`} ${upstreamRemote}/v${majorVersion}.x`; // only include "version-tags"
   return stdout.trim();
 }
 

scripts/createReleasePR.mjs

@@ -830,7 +830,7 @@ async function main() {
     // Always prompt for major version first
     const majorVersion = await selectMajorVersion(latestMajorVersion);
 
-    const latestTag = await findLatestTaggedVersionForMajor(majorVersion);
+    const latestTag = await findLatestTaggedVersionForMajor(majorVersion, upstreamRemote);
     const previousVersion = latestTag.startsWith('v') ? latestTag.slice(1) : latestTag;
     console.log(`Latest tag for major version ${majorVersion}: ${previousVersion}`);