Modify path retrieval logic

Co-authored-by: Copilot <[email protected]>

.github/workflows/get-node-versions.yml

@@ -1,7 +1,7 @@
 name: Get Node versions
 on:
   schedule:
-    - cron: '0 3,15 * * *'
+    - cron: '0 0,12 * * *'
   workflow_dispatch:
 
 jobs:
@@ -10,4 +10,4 @@ jobs:
     with:
       tool-name: "Node"
       image-url: "https://nodejs.org/static/images/logo-hexagon-card.png"
-    secrets: inherit
+    secrets: inherit

README.md

@@ -11,5 +11,8 @@ Latest of LTS versions will be installed on the [runner-images](https://github.c
 ## Adding new versions
 We are trying to prepare packages for new versions of Node.js as soon as they are released. Please open an issue in [actions/runner-images](https://github.com/actions/runner-images) if any versions are missing.
 
+## Support Notification Policy
+Beginning **approximately six months prior** to the removal of a Node.js version from the [versions-manifest.json](https://github.com/actions/node-versions/blob/main/versions-manifest.json) file, a pinned issue will be created in the [setup-node](https://github.com/actions/setup-node) repository. This pinned issue will provide important details about the upcoming end of support, including the specific date, as well as any other notes, relevant updates or alternatives. We encourage users to regularly check pinned issues for updates on tool versions they are using for maximum transparency, security, performance and overall compatibility with their projects.
+
 ## Contribution
 Contributions are welcome! See [Contributor's Guide](./CONTRIBUTING.md) for more details about contribution process and code structure

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

@@ -1,20 +1,49 @@
 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 {
+            $runnerProc = Get-Process -Name "Runner.Listener" -ErrorAction SilentlyContinue | Select-Object -First 1
+            #Write-Host "`$runnerProc: $($runnerProc | Out-String)"
+            if (-not $runnerProc -or -not $runnerProc.Path) {
+                Write-Error "Runner.Listener process not found."
+                return
+            }
+            # Go up two directories to get runner root
+            $runnerRoot = Split-Path (Split-Path $runnerProc.Path -Parent) -Parent
+            #Write-Host "`$runnerRoot: $runnerRoot"
+            # Recursively find all _diag/pages folders under the runner root directory
+            $possiblePaths = Get-ChildItem -Path $runnerRoot -Directory -Recurse -Depth 4 -ErrorAction SilentlyContinue |
+                Where-Object { $_.FullName -like "*_diag\pages" -or $_.FullName -like "*_diag/pages" }
+            Write-Host "LogsPaths:"
+            $possiblePaths | ForEach-Object { Write-Host $_.FullName }
+            
+            $logsFolderPath = $possiblePaths | Where-Object { Test-Path $_ } | Select-Object -First 1
+            if ($logsFolderPath) {
+                $resolvedPath = Resolve-Path -Path $logsFolderPath -ErrorAction SilentlyContinue
+            }
+
+            if ($resolvedPath -and -not [string]::IsNullOrEmpty($resolvedPath.Path) -and (Test-Path $resolvedPath.Path)) {                
+                $useNodeLogFile = Get-ChildItem -Path $resolvedPath | Where-Object {
+                            $logContent = Get-Content $_.Fullname -Raw
+                            return $logContent -match "setup-node@v"                     
+                    } | Select-Object -First 1                
+                
+              # Return the file name if a match is found
+                if ($useNodeLogFile) {
+                    return $useNodeLogFile.FullName
+                } else {
+                    Write-Error "No matching log file found in the specified path: $($resolvedPath.Path)"
+                }
+            } else {
+                Write-Error "The provided logs folder path is null, empty, or does not exist: $logsFolderPath"
+            }
+        }
+    }
+    
     It "is available" {
         "node --version" | Should -ReturnZeroExitCode
     }
@@ -34,15 +63,25 @@ Describe "Node.js" {
         $nodePath.startsWith($expectedPath) | Should -BeTrue -Because "'$nodePath' is not started with '$expectedPath'"
     }
 
-    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"
-    }
+     It "cached version is used without downloading" {
 
+       if ($env:RUNNER_TYPE -eq "self-hosted") {
+            # 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
+        }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
     }
-}
+}