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), $this.Architecture
+        $installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3)
         $installationTemplateContent | Out-File -FilePath $installationScriptLocation
 
         Write-Debug "Done; Installation script location: $installationScriptLocation)"

installers/nix-setup-template.sh

@@ -1,11 +1,10 @@
 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/$ARCH
+NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/x64
 
 echo "Check if Node.js hostedtoolcache folder exist..."
 if [ ! -d $NODE_TOOLCACHE_PATH ]; then
@@ -23,4 +22,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/$ARCH.complete
+touch $NODE_TOOLCACHE_VERSION_PATH/x64.complete

tests/Node.Tests.ps1

@@ -1,23 +1,20 @@
 Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1")
 
+BeforeAll {
+    function Get-UseNodeLogs {
+        # GitHub Windows images don't have `HOME` variable
+        $homeDir = $env:HOME ?? $env:HOMEDRIVE
+        $logsFolderPath = Join-Path -Path $homeDir -ChildPath "runners/*/_diag/pages" -Resolve
 
+        $useNodeLogFile = Get-ChildItem -Path $logsFolderPath | Where-Object {
+            $logContent = Get-Content $_.Fullname -Raw
+            return $logContent -match "setup-node@v"
+        } | Select-Object -First 1
+        return $useNodeLogFile.Fullname
+    }
+}
 
 Describe "Node.js" {
-
-    BeforeAll {
-        function Get-UseNodeLogs {
-            # GitHub Windows images don't have `HOME` variable
-            $homeDir = $env:HOME ?? $env:HOMEDRIVE
-            $logsFolderPath = Join-Path -Path $homeDir -ChildPath "runners/*/_diag/pages" -Resolve
-    
-            $useNodeLogFile = Get-ChildItem -Path $logsFolderPath | Where-Object {
-                $logContent = Get-Content $_.Fullname -Raw
-                return $logContent -match "setup-node@v"
-            } | Select-Object -First 1
-            return $useNodeLogFile.Fullname
-        }
-    }
-    
     It "is available" {
         "node --version" | Should -ReturnZeroExitCode
     }
@@ -37,25 +34,15 @@ Describe "Node.js" {
         $nodePath.startsWith($expectedPath) | Should -BeTrue -Because "'$nodePath' is not started with '$expectedPath'"
     }
 
-     It "cached version is used without downloading" {
+    It "cached version is used without downloading" {
-
+        # Analyze output of previous steps to check if Node.js was consumed from cache or downloaded
-       if ($env:RUNNER_TYPE -eq "self-hosted") {
+        $useNodeLogFile = Get-UseNodeLogs
-            # Get the installed version of Node.js
+        $useNodeLogFile | Should -Exist
-            $nodeVersion = Invoke-Expression "node --version"
+        $useNodeLogContent = Get-Content $useNodeLogFile -Raw
-            # Check if Node.js is installed
+        $useNodeLogContent | Should -Match "Found in cache"
-            $nodeVersion | Should -Not -BeNullOrEmpty
-            # Check if the installed version of Node.js is the expected version
-            $nodeVersion | Should -Match $env:VERSION
-        }else {
-            # 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"
-        } 
     }
-    
+
     It "Run simple code" {
         "node ./simple-test.js" | Should -ReturnZeroExitCode
     }
-}
+}