fix for check failures

Doing an upgrade for node 24, node 24 is stricter with types so need to add a type for achitecture

.licenses/npm/form-data-2.5.5.dep.yml

@@ -4,7 +4,7 @@ version: 2.5.5
 type: npm
 summary: A library to create readable "multipart/form-data" streams. Can be used to
   submit forms and file uploads to other web applications.
-homepage: 
+homepage:
 license: mit
 licenses:
 - sources: License

.licenses/npm/form-data-4.0.4.dep.yml

@@ -4,7 +4,7 @@ version: 4.0.4
 type: npm
 summary: A library to create readable "multipart/form-data" streams. Can be used to
   submit forms and file uploads to other web applications.
-homepage: 
+homepage:
 license: mit
 licenses:
 - sources: License

.licenses/npm/function-bind.dep.yml

@@ -29,3 +29,4 @@ licenses:
     THE SOFTWARE.
 
 notices: []
+...

README.md

@@ -191,15 +191,9 @@ steps:
 
 ## Getting go version from the go.mod file
 
-The `go-version-file` input accepts a path to a `go.mod` file or a `go.work`
-file that contains the version of Go to be used by a project. The version taken
-from thils file will be:
-
-  - The version from the `toolchain` directive, if there is one, otherwise
-  - The version from the `go` directive
-
-The version can specify a patch version or omit it altogether (e.g., `go 1.22.0` or `go 1.22`).
+The `go-version-file` input accepts a path to a `go.mod` file or a `go.work` file that contains the version of Go to be used by a project.
 
+The `go` directive in `go.mod` can specify a patch version or omit it altogether (e.g., `go 1.22.0` or `go 1.22`).  
 If a patch version is specified, that specific patch version will be used.  
 If no patch version is specified, it will search for the latest available patch version in the cache,
 [versions-manifest.json](https://github.com/actions/go-versions/blob/main/versions-manifest.json), and the

__tests__/setup-go.test.ts

@@ -129,9 +129,6 @@ describe('setup-go', () => {
   });
 
   afterEach(() => {
-    // clear out env var set during 'run'
-    delete process.env[im.GOTOOLCHAIN_ENV_VAR];
-
     //jest.resetAllMocks();
     jest.clearAllMocks();
     //jest.restoreAllMocks();
@@ -288,7 +285,7 @@ describe('setup-go', () => {
     expect(logSpy).toHaveBeenCalledWith(`Setup go version spec 1.13.0`);
   });
 
-  it('does not export GOROOT for Go versions >=1.9', async () => {
+  it('does not export any variables for Go versions >=1.9', async () => {
     inputs['go-version'] = '1.13.0';
     inSpy.mockImplementation(name => inputs[name]);
 
@@ -301,7 +298,7 @@ describe('setup-go', () => {
     });
 
     await main.run();
-    expect(vars).not.toHaveProperty('GOROOT');
+    expect(vars).toStrictEqual({});
   });
 
   it('exports GOROOT for Go versions <1.9', async () => {
@@ -317,7 +314,9 @@ describe('setup-go', () => {
     });
 
     await main.run();
-    expect(vars).toHaveProperty('GOROOT', toolPath);
+    expect(vars).toStrictEqual({
+      GOROOT: toolPath
+    });
   });
 
   it('finds a version of go already in the cache', async () => {
@@ -990,104 +989,4 @@ use .
       }
     );
   });
-
-  describe('go-version-file-toolchain', () => {
-    const goVersions = ['1.22.0', '1.21rc2', '1.18'];
-    const placeholderVersion = '1.19';
-    const buildGoMod = (
-      goVersion: string,
-      toolchainVersion: string
-    ) => `module example.com/mymodule
-
-go ${goVersion}
-
-toolchain go${toolchainVersion}
-
-require (
-	example.com/othermodule v1.2.3
-	example.com/thismodule v1.2.3
-	example.com/thatmodule v1.2.3
-)
-
-replace example.com/thatmodule => ../thatmodule
-exclude example.com/thismodule v1.3.0
-`;
-
-    const buildGoWork = (
-      goVersion: string,
-      toolchainVersion: string
-    ) => `go 1.19
-
-toolchain go${toolchainVersion}
-
-use .
-
-`;
-
-    goVersions.forEach(version => {
-      [
-        {
-          goVersionfile: 'go.mod',
-          fileContents: Buffer.from(buildGoMod(placeholderVersion, version)),
-          expected_version: version,
-          desc: 'from toolchain directive'
-        },
-        {
-          goVersionfile: 'go.work',
-          fileContents: Buffer.from(buildGoMod(placeholderVersion, version)),
-          expected_version: version,
-          desc: 'from toolchain directive'
-        },
-        {
-          goVersionfile: 'go.mod',
-          fileContents: Buffer.from(buildGoMod(placeholderVersion, version)),
-          gotoolchain_env: 'local',
-          expected_version: placeholderVersion,
-          desc: 'from go directive when GOTOOLCHAIN is local'
-        },
-        {
-          goVersionfile: 'go.work',
-          fileContents: Buffer.from(buildGoMod(placeholderVersion, version)),
-          gotoolchain_env: 'local',
-          expected_version: placeholderVersion,
-          desc: 'from go directive when GOTOOLCHAIN is local'
-        }
-      ].forEach(test => {
-        it(`reads version (${version}) in ${test.goVersionfile} ${test.desc}`, async () => {
-          inputs['go-version-file'] = test.goVersionfile;
-          if (test.gotoolchain_env !== undefined) {
-            process.env[im.GOTOOLCHAIN_ENV_VAR] = test.gotoolchain_env;
-          }
-          existsSpy.mockImplementation(() => true);
-          readFileSpy.mockImplementation(() => Buffer.from(test.fileContents));
-
-          await main.run();
-
-          expect(logSpy).toHaveBeenCalledWith(
-            `Setup go version spec ${test.expected_version}`
-          );
-          expect(logSpy).toHaveBeenCalledWith(
-            `Attempting to download ${test.expected_version}...`
-          );
-          expect(logSpy).toHaveBeenCalledWith(
-            `matching ${test.expected_version}...`
-          );
-        });
-      });
-    });
-  });
-
-  it('exports GOTOOLCHAIN and sets it in current process env', async () => {
-    inputs['go-version'] = '1.21.0';
-    inSpy.mockImplementation(name => inputs[name]);
-
-    const vars: {[key: string]: string} = {};
-    exportVarSpy.mockImplementation((name: string, val: string) => {
-      vars[name] = val;
-    });
-
-    await main.run();
-    expect(vars).toStrictEqual({GOTOOLCHAIN: 'local'});
-    expect(process.env).toHaveProperty('GOTOOLCHAIN', 'local');
-  });
 });

dist/setup/index.js

@@ -94312,7 +94312,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GOTOOLCHAIN_LOCAL_VAL = exports.GOTOOLCHAIN_ENV_VAR = void 0;
 exports.getGo = getGo;
 exports.extractGoArchive = extractGoArchive;
 exports.getManifest = getManifest;
@@ -94331,8 +94330,6 @@ const sys = __importStar(__nccwpck_require__(5632));
 const fs_1 = __importDefault(__nccwpck_require__(7147));
 const os_1 = __importDefault(__nccwpck_require__(2037));
 const utils_1 = __nccwpck_require__(1314);
-exports.GOTOOLCHAIN_ENV_VAR = 'GOTOOLCHAIN';
-exports.GOTOOLCHAIN_LOCAL_VAL = 'local';
 const MANIFEST_REPO_OWNER = 'actions';
 const MANIFEST_REPO_NAME = 'go-versions';
 const MANIFEST_REPO_BRANCH = 'main';
@@ -94666,18 +94663,8 @@ function parseGoVersionFile(versionFilePath) {
     const contents = fs_1.default.readFileSync(versionFilePath).toString();
     if (path.basename(versionFilePath) === 'go.mod' ||
         path.basename(versionFilePath) === 'go.work') {
-        // for backwards compatibility: use version from go directive if
-        // 'GOTOOLCHAIN' has been explicitly set
-        if (process.env[exports.GOTOOLCHAIN_ENV_VAR] !== exports.GOTOOLCHAIN_LOCAL_VAL) {
-            // toolchain directive: https://go.dev/ref/mod#go-mod-file-toolchain
-            const matchToolchain = contents.match(/^toolchain go(1\.\d+(?:\.\d+|rc\d+)?)/m);
-            if (matchToolchain) {
-                return matchToolchain[1];
-            }
-        }
-        // go directive: https://go.dev/ref/mod#go-mod-file-go
-        const matchGo = contents.match(/^go (\d+(\.\d+)*)/m);
-        return matchGo ? matchGo[1] : '';
+        const match = contents.match(/^go (\d+(\.\d+)*)/m);
+        return match ? match[1] : '';
     }
     return contents.trim();
 }
@@ -94795,7 +94782,6 @@ function run() {
             // If not supplied then problem matchers will still be setup.  Useful for self-hosted.
             //
             const versionSpec = resolveVersionInput();
-            setGoToolchain();
             const cache = core.getBooleanInput('cache');
             core.info(`Setup go version spec ${versionSpec}`);
             let arch = core.getInput('architecture');
@@ -94904,19 +94890,6 @@ function resolveVersionInput() {
     }
     return version;
 }
-function setGoToolchain() {
-    // docs: https://go.dev/doc/toolchain
-    // "local indicates the bundled Go toolchain (the one that shipped with the go command being run)"
-    // this is so any 'go' command is run with the selected Go version
-    // and doesn't trigger a toolchain download and run commands with that
-    // see e.g. issue #424
-    // and a similar discussion: https://github.com/docker-library/golang/issues/472.
-    // Set the value in process env so any `go` commands run as child-process
-    // don't cause toolchain downloads
-    process.env[installer.GOTOOLCHAIN_ENV_VAR] = installer.GOTOOLCHAIN_LOCAL_VAL;
-    // and in the runner env so e.g. a user running `go mod tidy` won't cause it
-    core.exportVariable(installer.GOTOOLCHAIN_ENV_VAR, installer.GOTOOLCHAIN_LOCAL_VAL);
-}
 
 
 /***/ }),

package-lock.json

@@ -35,6 +35,9 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.3.2",
         "typescript": "^5.8.3"
+      },
+      "engines": {
+        "node": ">=24.0.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {

package.json

@@ -4,6 +4,9 @@
   "private": true,
   "description": "setup go action",
   "main": "lib/setup-go.js",
+   "engines": {
+    "node": ">=24.0.0"
+  },
   "scripts": {
     "build": "tsc && ncc build -o dist/setup src/setup-go.ts && ncc build -o dist/cache-save src/cache-save.ts",
     "format": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --write \"**/*.{ts,yml,yaml}\"",

src/installer.ts

@@ -7,9 +7,8 @@ import * as sys from './system';
 import fs from 'fs';
 import os from 'os';
 import {StableReleaseAlias, isSelfHosted} from './utils';
+import {Architecture} from './types';
 
-export const GOTOOLCHAIN_ENV_VAR = 'GOTOOLCHAIN';
-export const GOTOOLCHAIN_LOCAL_VAL = 'local';
 const MANIFEST_REPO_OWNER = 'actions';
 const MANIFEST_REPO_NAME = 'go-versions';
 const MANIFEST_REPO_BRANCH = 'main';
@@ -41,7 +40,7 @@ export async function getGo(
   versionSpec: string,
   checkLatest: boolean,
   auth: string | undefined,
-  arch = os.arch()
+  arch: Architecture = os.arch() as Architecture
 ) {
   let manifest: tc.IToolRelease[] | undefined;
   const osPlat: string = os.platform();
@@ -153,7 +152,7 @@ async function resolveVersionFromManifest(
   versionSpec: string,
   stable: boolean,
   auth: string | undefined,
-  arch: string,
+  arch: Architecture,
   manifest: tc.IToolRelease[] | undefined
 ): Promise<string | undefined> {
   try {
@@ -355,7 +354,7 @@ export async function getInfoFromManifest(
   versionSpec: string,
   stable: boolean,
   auth: string | undefined,
-  arch = os.arch(),
+  arch: Architecture = os.arch() as Architecture,
   manifest?: tc.IToolRelease[] | undefined
 ): Promise<IGoVersionInfo | null> {
   let info: IGoVersionInfo | null = null;
@@ -381,7 +380,7 @@ export async function getInfoFromManifest(
 
 async function getInfoFromDist(
   versionSpec: string,
-  arch: string
+  arch: Architecture
 ): Promise<IGoVersionInfo | null> {
   const version: IGoVersion | undefined = await findMatch(versionSpec, arch);
   if (!version) {
@@ -400,7 +399,7 @@ async function getInfoFromDist(
 
 export async function findMatch(
   versionSpec: string,
-  arch = os.arch()
+  arch: Architecture = os.arch() as Architecture
 ): Promise<IGoVersion | undefined> {
   const archFilter = sys.getArch(arch);
   const platFilter = sys.getPlatform();
@@ -497,27 +496,17 @@ export function parseGoVersionFile(versionFilePath: string): string {
     path.basename(versionFilePath) === 'go.mod' ||
     path.basename(versionFilePath) === 'go.work'
   ) {
-    // for backwards compatibility: use version from go directive if
-    // 'GOTOOLCHAIN' has been explicitly set
-    if (process.env[GOTOOLCHAIN_ENV_VAR] !== GOTOOLCHAIN_LOCAL_VAL) {
-      // toolchain directive: https://go.dev/ref/mod#go-mod-file-toolchain
-      const matchToolchain = contents.match(
-        /^toolchain go(1\.\d+(?:\.\d+|rc\d+)?)/m
-      );
-      if (matchToolchain) {
-        return matchToolchain[1];
-      }
-    }
-
-    // go directive: https://go.dev/ref/mod#go-mod-file-go
-    const matchGo = contents.match(/^go (\d+(\.\d+)*)/m);
-    return matchGo ? matchGo[1] : '';
+    const match = contents.match(/^go (\d+(\.\d+)*)/m);
+    return match ? match[1] : '';
   }
 
   return contents.trim();
 }
 
-async function resolveStableVersionDist(versionSpec: string, arch: string) {
+async function resolveStableVersionDist(
+  versionSpec: string,
+  arch: Architecture
+) {
   const archFilter = sys.getArch(arch);
   const platFilter = sys.getPlatform();
   const dlUrl = 'https://golang.org/dl/?mode=json&include=all';

src/main.ts

@@ -8,6 +8,7 @@ import {isCacheFeatureAvailable} from './cache-utils';
 import cp from 'child_process';
 import fs from 'fs';
 import os from 'os';
+import {Architecture} from './types';
 
 export async function run() {
   try {
@@ -16,15 +17,14 @@ export async function run() {
     // If not supplied then problem matchers will still be setup.  Useful for self-hosted.
     //
     const versionSpec = resolveVersionInput();
-    setGoToolchain();
 
     const cache = core.getBooleanInput('cache');
     core.info(`Setup go version spec ${versionSpec}`);
 
-    let arch = core.getInput('architecture');
+    let arch = core.getInput('architecture') as Architecture;
 
     if (!arch) {
-      arch = os.arch();
+      arch = os.arch() as Architecture;
     }
 
     if (versionSpec) {
@@ -161,20 +161,3 @@ function resolveVersionInput(): string {
 
   return version;
 }
-
-function setGoToolchain() {
-  // docs: https://go.dev/doc/toolchain
-  // "local indicates the bundled Go toolchain (the one that shipped with the go command being run)"
-  // this is so any 'go' command is run with the selected Go version
-  // and doesn't trigger a toolchain download and run commands with that
-  // see e.g. issue #424
-  // and a similar discussion: https://github.com/docker-library/golang/issues/472.
-  // Set the value in process env so any `go` commands run as child-process
-  // don't cause toolchain downloads
-  process.env[installer.GOTOOLCHAIN_ENV_VAR] = installer.GOTOOLCHAIN_LOCAL_VAL;
-  // and in the runner env so e.g. a user running `go mod tidy` won't cause it
-  core.exportVariable(
-    installer.GOTOOLCHAIN_ENV_VAR,
-    installer.GOTOOLCHAIN_LOCAL_VAL
-  );
-}

src/system.ts

@@ -1,4 +1,5 @@
 import os from 'os';
+import {Architecture} from './types';
 
 export function getPlatform(): string {
   // darwin and linux match already
@@ -15,7 +16,7 @@ export function getPlatform(): string {
   return plat;
 }
 
-export function getArch(arch: string): string {
+export function getArch(arch: Architecture): string {
   // 'arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 's390', 's390x', 'x32', and 'x64'.
 
   // wants amd64, 386, arm64, armv61, ppc641e, s390x

src/types.ts

@@ -0,0 +1,2 @@
+// match what @actions/tool-cache expects
+export type Architecture = string;