.github/workflows/codeql-analysis.yml

@@ -13,4 +13,4 @@ jobs:
     name: CodeQL analysis 
     uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main
     with:
-      languages: '["go"]'
+      languages: "['go']"

README.md

@@ -11,8 +11,5 @@ 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 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.
 
-## Support Notification Policy
-Beginning **approximately six months prior** to the removal of a Go version from the [versions-manifest.json](https://github.com/actions/go-versions/blob/main/versions-manifest.json) file, a pinned issue will be created in the [setup-go](https://github.com/actions/setup-go) 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-go-builder.psm1

@@ -44,7 +44,7 @@ class NixGoBuilder : GoBuilder {
         $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)"

helpers

@@ -1 +1 @@
-Subproject commit 6fbb1f0f2098254142702dba05fe75cd8e77c4ae
+Subproject commit 6f1aa3ce73ce0ea4b58995a63b56a8677607762a

installers/nix-setup-template.sh

@@ -1,11 +1,10 @@
 set -e
 
 GO_VERSION={0}
-ARCH={1}
 
 GO_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/go
 GO_TOOLCACHE_VERSION_PATH=$GO_TOOLCACHE_PATH/$GO_VERSION
-GO_TOOLCACHE_VERSION_ARCH_PATH=$GO_TOOLCACHE_VERSION_PATH/$ARCH
+GO_TOOLCACHE_VERSION_ARCH_PATH=$GO_TOOLCACHE_VERSION_PATH/x64
 
 echo "Check if Go hostedtoolcache folder exist..."
 if [ ! -d $GO_TOOLCACHE_PATH ]; then
@@ -23,4 +22,4 @@ cp -R ./* $GO_TOOLCACHE_VERSION_ARCH_PATH
 rm $GO_TOOLCACHE_VERSION_ARCH_PATH/setup.sh
 
 echo "Create complete file"
-touch $GO_TOOLCACHE_VERSION_PATH/$ARCH.complete
+touch $GO_TOOLCACHE_VERSION_PATH/x64.complete

tests/Go.Tests.ps1

@@ -1,9 +1,7 @@
 Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1")
 Import-Module (Join-Path $PSScriptRoot "../helpers/common-helpers.psm1")
 
-Describe "Go" {
-
-    BeforeAll {
+BeforeAll {
     Set-Location -Path "source"
     $sourceLocation = Get-Location
 
@@ -20,6 +18,7 @@ Describe "Go" {
     }
 }
 
+Describe "Go" {
     It "is available" {
         "go version" | Should -ReturnZeroExitCode
     }
@@ -45,25 +44,12 @@ Describe "Go" {
     }
 
     It "cached version is used without downloading" {
-    
-    if ($env:RUNNER_TYPE -eq "self-hosted") {
-        # Get the installed version of Go
-        $goVersion = Invoke-Expression "go version"
-        # Check if Go is installed
-        $goVersion | Should -Not -BeNullOrEmpty
-        # Check if the installed version of Go is the expected version
-        $installedVersion = $goVersion -split " " | Select-Object -Index 2
-        $installedVersion = $installedVersion -replace "go", "" -replace "v", ""
-        $expectedVersion = $env:VERSION -replace ".0", ""
-        $installedVersion | Should -BeLike "$expectedVersion*"
-    }else {
         # Analyze output of previous steps to check if Go was consumed from cache or downloaded
         $useGoLogFile = Get-UseGoLogs
         $useGoLogFile | Should -Exist
         $useGoLogContent = Get-Content $useGoLogFile -Raw
         $useGoLogContent | Should -Match "Found in cache"
     }
-}
 
 
     It "Run simple code" {