Merge branch 'master' into feature/dependabot

Author: aleks-ivanov

release/createAdoPrs.js

@@ -209,7 +209,7 @@ async function main() {
             `Update agent publish script to version ${agentVersion}`,
             [
                 path.join(
-                    'tfs', `m${sprint}`, 'PipelinesAgentRelease', agentVersion, 'Publish.ps1'
+                    'tfs', `M${sprint}`, 'PipelinesAgentRelease', agentVersion, 'Publish.ps1'
                 )
             ],
             dryrun

src/Misc/externals.sh

@@ -23,6 +23,10 @@ if [[ "$PACKAGERUNTIME" == "win-arm64" ]]; then
     INCLUDE_NODE10=false;
 fi
 
+if [[ "$PACKAGERUNTIME" == "linux-arm" ]]; then
+    INCLUDE_NODE24=false
+fi
+
 NODE_VERSION="6.17.1"
 NODE10_VERSION="10.24.1"
 NODE16_VERSION="16.20.2"
@@ -302,7 +306,9 @@ else
         fi
         acquireExternalTool "${NODE_URL}/v${NODE16_VERSION}/node-v${NODE16_VERSION}-${ARCH}.tar.gz" node16 fix_nested_dir
         acquireExternalTool "${NODE_URL}/v${NODE20_VERSION}/node-v${NODE20_VERSION}-${ARCH}.tar.gz" node20_1 fix_nested_dir
-        acquireExternalTool "${NODE_URL}/v${NODE24_VERSION}/node-v${NODE24_VERSION}-${ARCH}.tar.gz" node24 fix_nested_dir
+        if [[ "$INCLUDE_NODE24" == "true" ]]; then
+            acquireExternalTool "${NODE_URL}/v${NODE24_VERSION}/node-v${NODE24_VERSION}-${ARCH}.tar.gz" node24 fix_nested_dir
+        fi
     fi
     # remove `npm`, `npx`, `corepack`, and related `node_modules` from the `externals/node*` agent directory
     # they are installed along with node, but agent does not use them
@@ -324,10 +330,12 @@ else
     rm "$LAYOUT_DIR/externals/node20_1/bin/npx"
     rm "$LAYOUT_DIR/externals/node20_1/bin/corepack"
 
-    rm -rf "$LAYOUT_DIR/externals/node24/lib"
-    rm "$LAYOUT_DIR/externals/node24/bin/npm"
-    rm "$LAYOUT_DIR/externals/node24/bin/npx"
-    rm "$LAYOUT_DIR/externals/node24/bin/corepack"
+    if [[ "$INCLUDE_NODE24" == "true" ]]; then
+        rm -rf "$LAYOUT_DIR/externals/node24/lib"
+        rm "$LAYOUT_DIR/externals/node24/bin/npm"
+        rm "$LAYOUT_DIR/externals/node24/bin/npx"
+        rm "$LAYOUT_DIR/externals/node24/bin/corepack"
+    fi
 fi
 
 if [[ "$L1_MODE" != "" || "$PRECACHE" != "" ]]; then