diff --git a/README.md b/README.md index b23585d..d4fa6fa 100644 --- a/README.md +++ b/README.md @@ -191,9 +191,15 @@ 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 `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` 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 diff --git a/__tests__/setup-go.test.ts b/__tests__/setup-go.test.ts index f94f9ee..b89c08f 100644 --- a/__tests__/setup-go.test.ts +++ b/__tests__/setup-go.test.ts @@ -129,6 +129,9 @@ describe('setup-go', () => { }); afterEach(() => { + // clear out env var set during 'run' + delete process.env[im.GOTOOLCHAIN_ENV_VAR]; + //jest.resetAllMocks(); jest.clearAllMocks(); //jest.restoreAllMocks(); @@ -285,7 +288,7 @@ describe('setup-go', () => { expect(logSpy).toHaveBeenCalledWith(`Setup go version spec 1.13.0`); }); - it('does not export any variables for Go versions >=1.9', async () => { + it('does not export GOROOT for Go versions >=1.9', async () => { inputs['go-version'] = '1.13.0'; inSpy.mockImplementation(name => inputs[name]); @@ -298,7 +301,7 @@ describe('setup-go', () => { }); await main.run(); - expect(vars).toStrictEqual({}); + expect(vars).not.toHaveProperty('GOROOT'); }); it('exports GOROOT for Go versions <1.9', async () => { @@ -314,9 +317,7 @@ describe('setup-go', () => { }); await main.run(); - expect(vars).toStrictEqual({ - GOROOT: toolPath - }); + expect(vars).toHaveProperty('GOROOT', toolPath); }); it('finds a version of go already in the cache', async () => { @@ -989,4 +990,104 @@ 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'); + }); }); diff --git a/dist/setup/index.js b/dist/setup/index.js index 11df681..96f4ef9 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -94312,6 +94312,7 @@ 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; @@ -94330,6 +94331,8 @@ 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'; @@ -94663,8 +94666,18 @@ function parseGoVersionFile(versionFilePath) { const contents = fs_1.default.readFileSync(versionFilePath).toString(); if (path.basename(versionFilePath) === 'go.mod' || path.basename(versionFilePath) === 'go.work') { - const match = contents.match(/^go (\d+(\.\d+)*)/m); - return match ? match[1] : ''; + // 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] : ''; } return contents.trim(); } @@ -94782,6 +94795,7 @@ 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'); @@ -94890,6 +94904,19 @@ 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); +} /***/ }), diff --git a/src/installer.ts b/src/installer.ts index 1b5f20f..2fad1d8 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -8,6 +8,8 @@ import fs from 'fs'; import os from 'os'; import {StableReleaseAlias, isSelfHosted} from './utils'; +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'; @@ -495,8 +497,21 @@ export function parseGoVersionFile(versionFilePath: string): string { path.basename(versionFilePath) === 'go.mod' || path.basename(versionFilePath) === 'go.work' ) { - const match = contents.match(/^go (\d+(\.\d+)*)/m); - return match ? match[1] : ''; + // 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] : ''; } return contents.trim(); diff --git a/src/main.ts b/src/main.ts index 690d277..0412d13 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,6 +16,7 @@ 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}`); @@ -160,3 +161,20 @@ 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 + ); +}