add minor fix (#81)

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

.github/CODEOWNERS

@@ -1 +1 @@
-* @actions/virtual-environments-owners
+* @actions/setup-actions-team

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

@@ -1,15 +1,17 @@
 name: Generate Go package
+run-name: Generate Go ${{ inputs.VERSION || '1.19.0' }}
 on:
   workflow_dispatch:
     inputs:
       VERSION:
         description: 'Go version to build and upload'
         required: true
-        default: '1.15.0'
+        default: '1.19.0'
       PUBLISH_RELEASES:
         description: 'Whether to publish releases'
+        type: boolean
         required: true
-        default: 'false'
+        default: false
   pull_request:
     paths-ignore:
     - 'versions-manifest.json'
@@ -18,153 +20,12 @@ on:
     branches:
     - 'main'
 
-env:
-  VERSION: ${{ github.event.inputs.VERSION || '1.15.3' }}
-defaults:
-  run:
-    shell: pwsh
-
 jobs:
-  build_go:
-    name: Build Go ${{ github.event.inputs.VERSION || '1.15.3' }} [${{ matrix.platform }}]
-    runs-on: ubuntu-latest
-    env: 
-      ARTIFACT_NAME: go-${{ github.event.inputs.VERSION || '1.15.3' }}-${{ matrix.platform }}-x64
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [linux, darwin, win32]
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Build Go ${{ env.VERSION }}
-      run: |
-        ./builders/build-go.ps1 -Version $env:VERSION `
-                                -Platform ${{ matrix.platform }}
-
-    - name: Publish artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: ${{ env.ARTIFACT_NAME }}
-        path: ${{ runner.temp }}/artifact
-
-  test_go:
-    name: Test Go ${{ github.event.inputs.VERSION || '1.15.3' }} [${{ matrix.platform }}]
-    needs: build_go
-    runs-on: ${{ matrix.os }}
-    env: 
-      ARTIFACT_NAME: go-${{ github.event.inputs.VERSION || '1.15.3' }}-${{ matrix.platform }}-x64
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - os: ubuntu-latest
-          platform: linux
-        - os: macos-latest
-          platform: darwin
-        - os: windows-latest
-          platform: win32
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Fully cleanup the toolcache directory before testing
-      run: ./helpers/clean-toolcache.ps1 -ToolName "go"
-
-    - name: Download artifact
-      uses: actions/download-artifact@v2
-      with:
-        path: ${{ runner.temp }}
-
-    - name: Extract files
-      run: |
-        if ('${{ matrix.platform }}' -eq 'win32') {
-          $artifactName = "${{ env.ARTIFACT_NAME }}.zip"
-          7z.exe x "$artifactName" -y | Out-Null 
-        } else {
-          $artifactName = "${{ env.ARTIFACT_NAME }}.tar.gz"
-          tar -xzf $artifactName
-        }
-      working-directory: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
-
-    - name: Apply build artifact to the local machine
-      run: |
-        if ('${{ matrix.platform }}' -eq 'win32') { powershell ./setup.ps1 } else { sh ./setup.sh }
-      working-directory: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
-
-    - name: Setup Go ${{ env.VERSION }}
-      uses: actions/setup-go@v2.1.3
-      with:
-        go-version: ${{ env.VERSION }}
-
-    - name: Wait for the logs
-      run: |
-        Write-Host "Fake step that do nothing"
-        Write-Host "We need it because log of previous step 'Setup Go' is not available here yet."
-        Write-Host "In testing step (Go.Tests.ps1) we analyze build log of 'Setup Go' task"
-        Write-Host "to determine if Go.js version was consumed from cache and was downloaded"
-        for ($i = 0; $i -lt 200; $i++) { Get-Random }
-
-    - name: Run tests
-      run: |
-        Install-Module Pester -Force -Scope CurrentUser
-        Import-Module Pester
-        Invoke-Pester -Script ./Go.Tests.ps1 -EnableExit
-      working-directory: ./tests
-
-  publish_release:
-    name: Publish release
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.PUBLISH_RELEASES == 'true'
-    needs: test_go
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/download-artifact@v2
-
-    - name: Publish Release ${{ env.VERSION }}
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.VERSION }}-${{ github.run_id }}
-        release_name: ${{ env.VERSION }}
-        body: |
-          Go ${{ env.VERSION }}
-
-    - name: Upload release assets
-      uses: actions/github-script@v2
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          const fs = require('fs');
-          for (let artifactDir of fs.readdirSync('.')) {
-            let artifactName = fs.readdirSync(`${artifactDir}`)[0];
-            console.log(`Upload ${artifactName} asset`);
-            github.repos.uploadReleaseAsset({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              release_id: ${{ steps.create_release.outputs.id }},
-              name: artifactName,
-              data: fs.readFileSync(`./${artifactDir}/${artifactName}`) 
-            });
-          }
-
-  trigger_pr:
-    name: Trigger "Create Pull Request" workflow
-    needs: publish_release
-    runs-on: ubuntu-latest
-    steps:
-    - name: Trigger "Create Pull Request" workflow
-      uses: actions/github-script@v3
-      with:
-        github-token: ${{ secrets.PERSONAL_TOKEN }}
-        script: |
-          github.actions.createWorkflowDispatch({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            workflow_id: 'create-pr.yml',
-            ref: 'main'
-          });
+  go:
+    name: Go
+    uses: actions/versions-package-tools/.github/workflows/build-tool-packages.yml@main
+    with:
+      tool-name: "go"
+      tool-version: ${{ inputs.VERSION || '1.19.0' }}
+      publish-release: ${{ inputs.PUBLISH_RELEASES || false }}
+    secrets: inherit

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,16 @@
+name: CodeQL analysis
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '0 3 * * 0'
+
+jobs:
+  call-codeQL-analysis:
+    name: CodeQL analysis 
+    uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main
+    with:
+      languages: "['go']"

.github/workflows/create-pr.yml

@@ -2,32 +2,9 @@ name: Create Pull Request
 on:
   workflow_dispatch:
 
-defaults:
-  run:
-    shell: pwsh
-
 jobs:
-  create_pr:
-    name: Create Pull Request
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Create versions-manifest.json
-      run: |
-        ./helpers/packages-generation/manifest-generator.ps1 -RepositoryFullName "$env:GITHUB_REPOSITORY" `
-                                                             -GitHubAccessToken "${{secrets.GITHUB_TOKEN}}" `
-                                                             -OutputFile "./versions-manifest.json" `
-                                                             -ConfigurationFile "./config/go-manifest-config.json"
-    - name: Create GitHub PR
-      run: |
-        $formattedDate = Get-Date -Format "MM/dd/yyyy"
-        ./helpers/github/create-pull-request.ps1 `
-                            -RepositoryFullName "$env:GITHUB_REPOSITORY" `
-                            -AccessToken "${{secrets.GITHUB_TOKEN}}" `
-                            -BranchName "update-versions-manifest-file" `
-                            -CommitMessage "Update versions-manifest" `
-                            -PullRequestTitle "[versions-manifest] Update for release from ${formattedDate}" `
-                            -PullRequestBody "Update versions-manifest.json for release from ${formattedDate}"
+  create-pr:
+    uses: actions/versions-package-tools/.github/workflows/create-pr-to-update-manifest.yml@main
+    with:
+      tool-name: "go"
+    secrets: inherit

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

@@ -0,0 +1,13 @@
+name: Get Go versions
+on:
+  schedule:
+    - cron: '0 3,15 * * *'
+  workflow_dispatch:
+
+jobs:
+  get-new-go-versions:
+    uses: actions/versions-package-tools/.github/workflows/get-new-tool-versions.yml@main
+    with:
+      tool-name: "Go"
+      image-url: "https://go.dev/images/gopher-footer.jpg"
+    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: "Go"
+      image-url: "https://go.dev/images/gopher-footer.jpg"
+    secrets: inherit

README.md

@@ -1,15 +1,15 @@
 # Go for Actions
-This repository contains the code and scripts that we use to prepare Go packages used in [virtual-environments](https://github.com/actions/virtual-environments) and accessible through the [setup-go](https://github.com/actions/setup-go) Action.  
+This repository contains the code and scripts that we use to prepare Go packages used in [runner-images](https://github.com/actions/runner-images) and accessible through the [setup-go](https://github.com/actions/setup-go) 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-go` action.
+> Caution: this is prepared for and only permitted for use by actions `runner-images` and `setup-go` 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-go`](https://github.com/actions/setup-go) 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-go`](https://github.com/actions/setup-go) action.
 
 ## Adding new versions
-We are trying to prepare packages for new versions of Go as soon as they are released. Please open an issue in [actions/virtual-environments](https://github.com/actions/virtual-environments) if any versions are missing.
+We are trying to prepare packages for new versions of Go 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

builders/go-builder.psm1

@@ -58,7 +58,7 @@ class GoBuilder {
         $arch = ($this.Architecture -eq "x64") ? "amd64" : $this.Architecture
         $goPlatform = ($this.Platform -Match "win32") ? "windows" : $this.Platform
         $ArchiveType = ($this.Platform -Match "win32") ? "zip" : "tar.gz"
-        If ($this.Version.Build -eq "0") {
+        If ($this.Version.Build -eq "0" -and $this.Version -lt "1.21.0") {
             $goVersion = "go$($this.Version.ToString(2))"
         } else {
             $goVersion = "go$($this.Version.ToString(3))"

config/go-manifest-config.json

@@ -1,5 +1,5 @@
 {
-    "regex": "go-\\d+\\.\\d+\\.\\d+-(\\w+)-(x\\d+)",
+    "regex": "go-\\d+\\.\\d+\\.\\d+-(\\w+)-((x|arm)\\d+)",
     "groups": {
         "arch": 2,
         "platform": 1