Merge pull request #125 from actions/update-codeowners

Update CODEOWNERS

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @actions/setup-actions-team

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

@@ -0,0 +1,31 @@
+name: Generate Node.js packages
+run-name: Generate Node.js ${{ inputs.VERSION || '18.12.0' }}
+on:
+  workflow_dispatch:
+    inputs:
+      VERSION:
+        description: 'Node.js version to build and upload'
+        required: true
+        default: '18.12.0'
+      PUBLISH_RELEASES:
+        description: 'Whether to publish releases'
+        required: true
+        type: boolean
+        default: false
+  pull_request:
+    paths-ignore:
+    - 'versions-manifest.json'
+    - 'LICENSE'
+    - '**.md'
+    branches:
+    - 'main'
+
+jobs:
+  node:
+    name: Node
+    uses: actions/versions-package-tools/.github/workflows/build-tool-packages.yml@main
+    with:
+      tool-name: "node"
+      tool-version: ${{ inputs.VERSION || '18.12.0' }}
+      publish-release: ${{ inputs.PUBLISH_RELEASES || false }}
+    secrets: inherit

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '31 9 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/create-pr.yml

@@ -0,0 +1,10 @@
+name: Create Pull Request
+on:
+  workflow_dispatch:
+
+jobs:
+  create-pr:
+    uses: actions/versions-package-tools/.github/workflows/create-pr-to-update-manifest.yml@main
+    with:
+      tool-name: "node"
+    secrets: inherit

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

@@ -0,0 +1,13 @@
+name: Get Node versions
+on:
+  schedule:
+    - cron: '0 3,15 * * *'
+  workflow_dispatch:
+
+jobs:
+  get-new-node-versions:
+    uses: actions/versions-package-tools/.github/workflows/get-new-tool-versions.yml@main
+    with:
+      tool-name: "Node"
+      image-url: "https://nodejs.org/static/images/logo-hexagon-card.png"
+    secrets: inherit

.github/workflows/validate-manifest.yml

@@ -0,0 +1,21 @@
+name: Validate manifest
+on:
+# The GITHUB_TOKEN secret is used to create a PR
+# The pull_request event will not be triggered by it
+# That's one of the reasons we need the schedule to validate the versions-manifest.json file
+  schedule:
+    - cron: '0 8,20 * * *'
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'versions-manifest.json'
+
+jobs:
+  manifest:
+    uses: actions/versions-package-tools/.github/workflows/validate-manifest.yml@main
+    with:
+      tool-name: "Node"
+      image-url: "https://nodejs.org/static/images/logo-hexagon-card.png"
+    secrets: inherit

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "helpers"]
 	path = helpers
 	url = https://github.com/actions/versions-package-tools
-	branch = master
+	branch = main

CONTRIBUTING.md

@@ -29,22 +29,20 @@ Here are a few things you can do that will increase the likelihood of your pull
 ### Directory structure
 ```
 
-├── azure-pipelines/
-|   └──templates/
+├── .github/
+|   └──workflows/
 ├── builders/
 ├── helpers/
 ├── installers/
 └── tests/
     └──sources/
 ```
-- `azure-pipelines*` - contains global YAML definitions for build pipelines. Reusable templates for specific jobs are located in `templates` subfolder.
+- `.github/workflows` - contains repository workflow files.
 - `builders` - contains Node.js builder classes and functions.
-- `helpers` - contains global helper functions and functions.
+- `helpers` - contains global helper classes and functions.
 - `installers` - contains installation script templates.
 - `tests` - contains test scripts. Required tests sources are located in `sources` subfolder.
 
-\* _We use Azure Pipelines because there are a few features that Actions is still missing, we'll move to Actions as soon as possible_.
-
 ## Resources
 
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

README.md

@@ -1,15 +1,15 @@
 # Node.js for Actions
-This repository contains the code and scripts that we use to prepare Node.js packages used in [virtual-environments](https://github.com/actions/virtual-environments) and accessible through the [setup-node](https://github.com/actions/setup-node) Action.  
+This repository contains the code and scripts that we use to prepare Node.js packages used in [runner-images](https://github.com/actions/runner-images) and accessible through the [setup-node](https://github.com/actions/setup-node) Action.  
 The file [versions-manifest.json](./versions-manifest.json) contains the list of available and released versions.  
 
-> Caution: this is prepared for and only permitted for use by actions `virtual-environments` and `setup-node` action.
+> Caution: this is prepared for and only permitted for use by actions `runner-images` and `setup-node` action.
 
 **Status**: Currently under development and in use for beta and preview actions.  This repo is undergoing rapid changes.
 
-Latest of LTS versions will be installed on the [virtual-environments](https://github.com/actions/virtual-environments) images.  Other versions will be pulled JIT using the [`setup-node`](https://github.com/actions/setup-node) action.
+Latest of LTS versions will be installed on the [runner-images](https://github.com/actions/runner-images) images. Other versions will be pulled JIT using the [`setup-node`](https://github.com/actions/setup-node) action.
 
 ## 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 if any versions are missing.
+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.
 
 ## Contribution
 Contributions are welcome! See [Contributor's Guide](./CONTRIBUTING.md) for more details about contribution process and code structure

azure-pipelines/build-node-packages.yml

@@ -1,65 +0,0 @@
-name: $(date:yyyyMMdd)$(rev:.r)-Node.js-$(VERSION)
-trigger: none
-pr:
-  autoCancel: true
-  branches:
-    include:
-    - master
-  paths:
-    exclude:
-    - versions-manifest.json
-
-stages:
-- stage: Build_Node_Darwin
-  dependsOn: []
-  variables:
-    Platform: darwin
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/build-job.yml
-
-- stage: Test_Node_Darwin
-  condition: succeeded()
-  dependsOn: Build_Node_Darwin
-  variables:
-    VmImage: macOS-latest
-    Platform: darwin
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/test-job.yml
-
-- stage: Build_Node_Linux
-  dependsOn: []
-  variables:
-    Platform: linux
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/build-job.yml
-
-- stage: Test_Node_Linux
-  condition: succeeded()
-  dependsOn: Build_Node_Linux
-  variables:
-    VmImage: ubuntu-latest
-    Platform: linux
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/test-job.yml
-
-- stage: Build_Node_Windows
-  dependsOn: []
-  variables:
-    Platform: win32
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/build-job.yml
-
-- stage: Test_Node_Windows
-  condition: succeeded()
-  dependsOn: Build_Node_Windows
-  variables:
-    VmImage: windows-latest
-    Platform: win32
-    Architecture: x64
-  jobs:
-  - template: /azure-pipelines/templates/test-job.yml

azure-pipelines/templates/build-job.yml

@@ -1,21 +0,0 @@
-jobs:
-- job: Build_Node
-  timeoutInMinutes: 90
-  pool:
-    name: Azure Pipelines
-    vmImage: ubuntu-latest
-  steps:
-  - checkout: self
-    
-  - task: PowerShell@2
-    displayName: 'Build Node $(Version)'
-    inputs:
-      targetType: filePath
-      filePath: './builders/build-node.ps1'
-      arguments: '-Version $(Version) -Platform $(Platform) -Architecture $(Architecture)'
-
-  - task: PublishPipelineArtifact@1
-    displayName: 'Publish Artifact: Node.js $(Version)'
-    inputs:
-      targetPath: '$(Build.ArtifactStagingDirectory)' 
-      artifactName: 'node-$(Version)-$(Platform)-$(Architecture)'

azure-pipelines/templates/test-job.yml

@@ -1,75 +0,0 @@
-jobs:
-- job: Test_Node
-  pool: 
-    name: Azure Pipelines
-    vmImage: $(VmImage)
-  steps:
-  - checkout: self
-    submodules: true
-
-  - task: PowerShell@2
-    displayName: Fully cleanup the toolcache directory before testing
-    inputs:
-      targetType: filePath
-      filePath: helpers/clean-toolcache.ps1
-      arguments: -ToolName "node"
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      source: 'current'
-      artifact: 'node-$(Version)-$(Platform)-$(Architecture)'
-      path: $(Build.ArtifactStagingDirectory)
-
-  - task: ExtractFiles@1
-    inputs:
-      archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).*'
-      destinationFolder: $(Build.BinariesDirectory)
-      cleanDestinationFolder: false
-
-  - task: PowerShell@2
-    displayName: 'Apply build artifact to the local machines'
-    inputs:
-      targetType: inline
-      script: |
-        if ("$(Platform)" -match 'win32') { powershell ./setup.ps1 } else { sh ./setup.sh }
-      workingDirectory: '$(Build.BinariesDirectory)'
-
-  - task: NodeTool@0
-    displayName: 'Use Node $(Version)'
-    inputs:
-      versionSpec: $(Version)
-
-  - task: PowerShell@2
-    displayName: 'Wait for the logs'
-    inputs:
-      targetType: inline
-      script: |
-         Write-Host "Fake step that do nothing"
-         Write-Host "We need it because log of previous step 'Use Node' is not available here yet."
-         Write-Host "In testing step (Node.Tests.ps1) we analyze build log of 'Use Node' task"
-         Write-Host "to determine if Node.js version was consumed from cache and was downloaded"
-  - task: PowerShell@2
-    displayName: 'Run tests'
-    inputs:
-      TargetType: inline
-      script: |
-        Install-Module Pester -Force -Scope CurrentUser -RequiredVersion 4.10.1
-        Import-Module Pester
-        $pesterParams = @{
-          Path="./Node.Tests.ps1";
-          Parameters=@{
-            Version="$(Version)";
-          }
-        }
-        Invoke-Pester -Script $pesterParams -OutputFile "test_results.xml" -OutputFormat NUnitXml
-      workingDirectory: '$(Build.SourcesDirectory)/tests'
-
-  - task: PublishTestResults@2
-    displayName: 'Publish test results'
-    inputs:
-      testResultsFiles: '*.xml'
-      testResultsFormat: NUnit
-      searchFolder: 'tests'
-      failTaskOnFailedTests: true
-      testRunTitle: "Node.js $(Version)-$(Platform)"
-    condition: always()

builders/build-node.ps1

@@ -1,5 +1,5 @@
-using module "./builders/win-node-builder.psm1"
-using module "./builders/nix-node-builder.psm1"
+using module "./win-node-builder.psm1"
+using module "./nix-node-builder.psm1"
 
 <#
 .SYNOPSIS

builders/nix-node-builder.psm1

@@ -1,4 +1,4 @@
-using module "./builders/node-builder.psm1"
+using module "./node-builder.psm1"
 
 class NixNodeBuilder : NodeBuilder {
     <#

builders/node-builder.psm1

@@ -16,10 +16,13 @@ class NodeBuilder {
     The architecture with which Node.js should be built.
 
     .PARAMETER TempFolderLocation
-    The location of temporary files that will be used during Node.js package generation. Using system BUILD_STAGINGDIRECTORY variable value.
+    The location of temporary files that will be used during Node.js package generation.
 
-    .PARAMETER ArtifactLocation
-    The location of generated Node.js artifact. Using system environment BUILD_BINARIESDIRECTORY variable value.
+    .PARAMETER WorkFolderLocation
+    The location of installation files.
+
+    .PARAMETER ArtifactFolderLocation
+    The location of generated Node.js artifact.
 
     .PARAMETER InstallationTemplatesLocation
     The location of installation script template. Using "installers" folder from current repository.
@@ -40,9 +43,8 @@ class NodeBuilder {
         $this.Architecture = $architecture
 
         $this.TempFolderLocation = [IO.Path]::GetTempPath()
-        $this.WorkFolderLocation = $env:BUILD_BINARIESDIRECTORY
-        $this.ArtifactFolderLocation = $env:BUILD_STAGINGDIRECTORY
-        
+        $this.WorkFolderLocation = Join-Path $env:RUNNER_TEMP "binaries"
+        $this.ArtifactFolderLocation = Join-Path $env:RUNNER_TEMP "artifact"
 
         $this.InstallationTemplatesLocation = Join-Path -Path $PSScriptRoot -ChildPath "../installers"
     }
@@ -84,6 +86,10 @@ class NodeBuilder {
         Generates Node.js artifact from downloaded binaries.
         #>
 
+        Write-Host "Create WorkFolderLocation and ArtifactFolderLocation folders"
+        New-Item -Path $this.WorkFolderLocation -ItemType "directory"
+        New-Item -Path $this.ArtifactFolderLocation -ItemType "directory"
+
         Write-Host "Download Node.js $($this.Version) [$($this.Architecture)] executable..."
         $binariesArchivePath = $this.Download()
 

builders/win-node-builder.psm1

@@ -1,4 +1,4 @@
-using module "./builders/node-builder.psm1"
+using module "./node-builder.psm1"
 
 class WinNodeBuilder : NodeBuilder {
     <#

config/node-manifest-config.json

@@ -3,5 +3,6 @@
     "groups": {
         "arch": 2,
         "platform": 1
-    }
+    },
+    "lts_rule_expression": "(Invoke-RestMethod 'https://raw.githubusercontent.com/nodejs/Release/main/schedule.json').PSObject.Properties | Where-Object { $_.Value.codename } | ForEach-Object { @{ Name = $_.Name.TrimStart('v'); Value = $_.Value.codename } }"
 }

tests/Node.Tests.ps1

@@ -1,18 +1,17 @@
-param (
-    [Version] [Parameter (Mandatory = $true)] [ValidateNotNullOrEmpty()]
-    $Version
-)
-
 Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1")
 
-function Get-UseNodeLogs {
-    $logsFolderPath = Join-Path -Path $env:AGENT_HOMEDIRECTORY -ChildPath "_diag" | Join-Path -ChildPath "pages"
+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 "Use Node"
-    } | Select-Object -First 1
-    return $useNodeLogFile.Fullname
+        $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" {
@@ -22,13 +21,16 @@ Describe "Node.js" {
 
     It "version is correct" {
         $versionOutput = Invoke-Expression "node --version"
-        $versionOutput | Should -Match $Version
+        $versionOutput | Should -Match $env:VERSION
     }
 
     It "is used from tool-cache" {
         $nodePath = (Get-Command "node").Path
         $nodePath | Should -Not -BeNullOrEmpty
-        $expectedPath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "node"
+        
+        # GitHub Windows images don't have `AGENT_TOOLSDIRECTORY` variable
+        $toolcacheDir = $env:AGENT_TOOLSDIRECTORY ?? $env:RUNNER_TOOL_CACHE
+        $expectedPath = Join-Path -Path $toolcacheDir -ChildPath "node"
         $nodePath.startsWith($expectedPath) | Should -BeTrue -Because "'$nodePath' is not started with '$expectedPath'"
     }
 
@@ -37,7 +39,7 @@ Describe "Node.js" {
         $useNodeLogFile = Get-UseNodeLogs
         $useNodeLogFile | Should -Exist
         $useNodeLogContent = Get-Content $useNodeLogFile -Raw
-        $useNodeLogContent | Should -Match "Found tool in cache"
+        $useNodeLogContent | Should -Match "Found in cache"
     }
 
     It "Run simple code" {