Update build-node-packages.yml

Co-authored-by: Service account <no-reply@microsoft.com>

.github/workflows/build-node-packages.yml

@@ -28,4 +28,4 @@ jobs:
       tool-name: "node"
       tool-version: ${{ inputs.VERSION || '18.12.0' }}
       publish-release: ${{ inputs.PUBLISH_RELEASES || false }}
-    secrets: inherit
+    secrets: inherit

builders/nix-node-builder.psm1

@@ -54,7 +54,7 @@ class NixNodeBuilder : NodeBuilder {
         $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName
 
         $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw
-        $installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3)
+        $installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3), $this.Architecture
         $installationTemplateContent | Out-File -FilePath $installationScriptLocation
 
         Write-Debug "Done; Installation script location: $installationScriptLocation)"

installers/nix-setup-template.sh

@@ -1,10 +1,11 @@
 set -e
 
 NODE_VERSION={0}
+ARCH={1}
 
 NODE_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/node
 NODE_TOOLCACHE_VERSION_PATH=$NODE_TOOLCACHE_PATH/$NODE_VERSION
-NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/x64
+NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/$ARCH
 
 echo "Check if Node.js hostedtoolcache folder exist..."
 if [ ! -d $NODE_TOOLCACHE_PATH ]; then
@@ -22,4 +23,4 @@ cp -R ./* $NODE_TOOLCACHE_VERSION_ARCH_PATH
 rm $NODE_TOOLCACHE_VERSION_ARCH_PATH/setup.sh
 
 echo "Create complete file"
-touch $NODE_TOOLCACHE_VERSION_PATH/x64.complete
+touch $NODE_TOOLCACHE_VERSION_PATH/$ARCH.complete

tests/Node.Tests.ps1

@@ -35,14 +35,24 @@ Describe "Node.js" {
     }
 
     It "cached version is used without downloading" {
-        # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded
-        $useNodeLogFile = Get-UseNodeLogs
-        $useNodeLogFile | Should -Exist
-        $useNodeLogContent = Get-Content $useNodeLogFile -Raw
-        $useNodeLogContent | Should -Match "Found in cache"
+        if ($env:RUNNER_TYPE -eq "GitHub") {
+            # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded
+            $useNodeLogFile = Get-UseNodeLogs
+            $useNodeLogFile | Should -Exist
+            $useNodeLogContent = Get-Content $useNodeLogFile -Raw
+            $useNodeLogContent | Should -Match "Found in cache"
+        } else {
+            # Get the installed version of Node.js
+            $nodeVersion = Invoke-Expression "node --version"
+            # Check if Node.js is installed
+            $nodeVersion | Should -Not -BeNullOrEmpty
+            # Check if the installed version of Node.js is the expected version
+            $nodeVersion | Should -Match $env:VERSION
+        }
     }
 
+
     It "Run simple code" {
         "node ./simple-test.js" | Should -ReturnZeroExitCode
     }
-}
+}