Enhance workflows and Upgrade micromatch Dependency (#510 )

* Update workflows and bump dependencies * Add test for Go 1.22 and 1.23 * Update Go versions in local-cache setup and include macos-latest with ARM64 architecture
Revise isGhes logic (#511 )
2026-03-13 11:37:39 +08:00 · 2024-10-23 22:39:31 -05:00 · 2024-10-21 11:56:08 -05:00 · 2024-09-26 08:24:19 +02:00 · 2024-09-16 17:20:25 +02:00 · 2024-09-11 10:48:12 +02:00
13 changed files with 129 additions and 140 deletions
--- a/.github/workflows/outputs.yml
+++ b/.github/workflows/outputs.yml
@@ -1,24 +0,0 @@
-name: Test outputs
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  setup-go-env:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - id: setup-go
-        uses: ./
-      - run: |
-          echo GOPATH=${{ steps.setup-go.outputs.go-path }}
-          echo GOMOD=${{ steps.setup-go.outputs.go-mod }}
-          echo GOMODCACHE=${{ steps.setup-go.outputs.go-mod-cache }}
-          echo GOVERSION=${{ steps.setup-go.outputs.go-version }}
-          echo GOCACHE=${{ steps.setup-go.outputs.go-cache }}
-
-          echo Go environment variables json:
-          jq . <<< '${{ steps.setup-go.outputs.go-env }}'
--- a/.github/workflows/publish-immutable-actions.yml
+++ b/.github/workflows/publish-immutable-actions.yml
@@ -0,0 +1,20 @@
+name: 'Publish Immutable Action Version'
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
+
+    steps:
+      - name: Checking out
+        uses: actions/checkout@v4
+      - name: Publish
+        id: publish
+        uses: actions/publish-immutable-action@0.0.3
--- a/.github/workflows/release-new-action-version.yml
+++ b/.github/workflows/release-new-action-version.yml
@@ -22,7 +22,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Update the ${{ env.TAG_NAME }} tag
-        uses: actions/publish-action@v0.2.2
+        uses: actions/publish-action@v0.3.0
        with:
          source-tag: ${{ env.TAG_NAME }}
          slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
--- a/.github/workflows/versions.yml
+++ b/.github/workflows/versions.yml
@@ -18,7 +18,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go Stable
@@ -33,7 +33,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go oldStable
@@ -48,12 +48,14 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        version: [stable, oldstable]
        architecture: [x64, x32]
        exclude:
          - os: macos-latest
            architecture: x32
+          - os: macos-13
+            architecture: x32
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go ${{ matrix.version }} ${{ matrix.architecture }}
@@ -70,8 +72,14 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.20.14, 1.21.10, 1.22.3]
+        os: [macos-latest, windows-latest, ubuntu-latest, macos-13]
+        go: [1.21.13, 1.22.8, 1.23.2]
+        include:
+          - os: windows-latest
+            go: 1.20.14
+        exclude:
+          - os: windows-latest
+            go: 1.23.2
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -90,8 +98,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.20.14, 1.21]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+        go-version: ['1.20', '1.21', '1.22', '1.23']
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go and check latest
@@ -107,7 +115,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go and check latest
@@ -123,7 +131,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go and check latest
@@ -135,13 +143,12 @@ jobs:
        shell: bash

  setup-versions-from-manifest:
-    name: Setup ${{ matrix.go }} ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.20.14, 1.21.10, 1.22.3]
+        os: [macos-latest, windows-latest, ubuntu-latest, macos-13]
+        go: [1.20.14, 1.21.10, 1.22.8, 1.23.2]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -156,13 +163,12 @@ jobs:
        shell: bash

  setup-versions-from-dist:
-    name: Setup ${{ matrix.go }} ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.20.14, 1.21]
+        os: [windows-latest, ubuntu-latest, macos-13]
+        go: [1.11.12]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -181,14 +187,23 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.20.14, 1.21]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+        go-version: [1.20.14, 1.21, 1.22, 1.23]
+        include:
+          - os: macos-latest
+            architecture: arm64
+          - os: ubuntu-latest
+            architecture: x64
+          - os: windows-latest
+            architecture: x64
+          - os: macos-13
+            architecture: x64
    steps:
      - uses: actions/checkout@v4
      - name: Setup Go and check latest
        uses: ./
        with:
          go-version: ${{ matrix.go-version }}
-          architecture: x64
+          architecture: ${{ matrix.architecture }}
      - name: Verify Go
        run: go version
--- a/tests/cache-utils.test.ts
+++ b/tests/cache-utils.test.ts
@@ -209,3 +209,41 @@ describe('isCacheFeatureAvailable', () => {
    expect(warningSpy).toHaveBeenCalledWith(warningMessage);
  });
 });
+
+describe('isGhes', () => {
+  const pristineEnv = process.env;
+
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = {...pristineEnv};
+  });
+
+  afterAll(() => {
+    process.env = pristineEnv;
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is not defined', async () => {
+    delete process.env['GITHUB_SERVER_URL'];
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to github.com', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://github.com';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to a GitHub Enterprise Cloud-style URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://contoso.ghe.com';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable has a .localhost suffix', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://mock-github.localhost';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns true when the GITHUB_SERVER_URL environment variable is set to some other URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://src.onpremise.fabrikam.com';
+    expect(cacheUtils.isGhes()).toBeTruthy();
+  });
+});
--- a/tests/setup-go.test.ts
+++ b/tests/setup-go.test.ts
@@ -138,29 +138,6 @@ describe('setup-go', () => {
    expect(main.parseGoVersion(goVersionOutput)).toBe('1.16.6');
  });

-  it('can read go env variables', async () => {
-    const goRoot = '/opt/hostedtoolcache/go/1.18.10/x64';
-    const goPath = '/home/runner/go';
-    const goModCache = '/home/runner/go/pkg/mod';
-    const goCache = '/home/runner/.cache/go-build';
-    const goVersion = 'go1.18.10';
-
-    const env = `
-GOROOT="${goRoot}"
-GOPATH="${goPath}"
-GOMODCACHE="${goModCache}"
-GOCACHE="${goCache}"
-GOVERSION="${goVersion}"
-    `;
-    const json = JSON.parse(main.convertEnvStringToJson(env));
-    expect(json).toBeDefined();
-    expect(json['GOROOT']).toBe(goRoot);
-    expect(json['GOPATH']).toBe(goPath);
-    expect(json['GOMODCACHE']).toBe(goModCache);
-    expect(json['GOCACHE']).toBe(goCache);
-    expect(json['GOVERSION']).toBe(goVersion);
-  });
-
  it('can find 1.9.7 from manifest on osx', async () => {
    os.platform = 'darwin';
    os.arch = 'x64';
--- a/action.yml
+++ b/action.yml
@@ -22,18 +22,6 @@ inputs:
 outputs:
  go-version:
    description: 'The installed Go version. Useful when given a version range as input.'
-  go-cache:
-    description: 'The GOCACHE environment variable'
-  go-path:
-    description: 'The GOPATH environment variable'
-  go-root:
-    description: 'The GOROOT environment variable'
-  go-mod:
-    description: 'The GOMOD environment variable'
-  go-mod-cache:
-    description: 'The GOMODCACHE environment variable'
-  go-env:
-    description: 'The Go environment variables in JSON format'
  cache-hit:
    description: 'A boolean value to indicate if a cache was hit'
 runs:
--- a/dist/cache-save/index.js
+++ b/dist/cache-save/index.js
@@ -81175,7 +81175,11 @@ const getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0,
 exports.getCacheDirectoryPath = getCacheDirectoryPath;
 function isGhes() {
    const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+    const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+    const isGitHubHost = hostname === 'GITHUB.COM';
+    const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+    const isLocalHost = hostname.endsWith('.LOCALHOST');
+    return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -88045,6 +88045,7 @@ const cache_utils_1 = __nccwpck_require__(1678);
 const restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () {
    const packageManagerInfo = yield (0, cache_utils_1.getPackageManagerInfo)(packageManager);
    const platform = process.env.RUNNER_OS;
+    const arch = process.arch;
    const cachePaths = yield (0, cache_utils_1.getCacheDirectoryPath)(packageManagerInfo);
    const dependencyFilePath = cacheDependencyPath
        ? cacheDependencyPath
@@ -88054,7 +88055,7 @@ const restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __awa
        throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
    }
    const linuxVersion = process.env.RUNNER_OS === 'Linux' ? `${process.env.ImageOS}-` : '';
-    const primaryKey = `setup-go-${platform}-${linuxVersion}go-${versionSpec}-${fileHash}`;
+    const primaryKey = `setup-go-${platform}-${arch}-${linuxVersion}go-${versionSpec}-${fileHash}`;
    core.debug(`primary key is ${primaryKey}`);
    core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
    const cacheKey = yield cache.restoreCache(cachePaths, primaryKey);
@@ -88164,7 +88165,11 @@ const getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0,
 exports.getCacheDirectoryPath = getCacheDirectoryPath;
 function isGhes() {
    const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+    const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+    const isGitHubHost = hostname === 'GITHUB.COM';
+    const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+    const isLocalHost = hostname.endsWith('.LOCALHOST');
+    return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
@@ -88634,7 +88639,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.convertEnvStringToJson = exports.parseGoVersion = exports.addBinToPath = exports.run = void 0;
+exports.parseGoVersion = exports.addBinToPath = exports.run = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const io = __importStar(__nccwpck_require__(7436));
 const installer = __importStar(__nccwpck_require__(2574));
@@ -88682,19 +88687,11 @@ function run() {
            core.debug(`add bin ${added}`);
            const goPath = yield io.which('go');
            const goVersion = (child_process_1.default.execSync(`${goPath} version`) || '').toString();
-            const goEnv = (child_process_1.default.execSync(`${goPath} env`) || '').toString();
-            const goEnvJson = JSON.parse(convertEnvStringToJson(goEnv));
-            const parsedGoVersion = parseGoVersion(goVersion);
-            // Go versions less that 1.16 do not have the GOVERSION environment variable
-            if (semver.lt(parsedGoVersion, '1.16.0')) {
-                goEnvJson['GOVERSION'] = 'go' + parsedGoVersion;
-            }
-            core.info(goVersion);
            if (cache && (0, cache_utils_1.isCacheFeatureAvailable)()) {
                const packageManager = 'default';
                const cacheDependencyPath = core.getInput('cache-dependency-path');
                try {
-                    yield (0, cache_restore_1.restoreCache)(parsedGoVersion, packageManager, cacheDependencyPath);
+                    yield (0, cache_restore_1.restoreCache)(parseGoVersion(goVersion), packageManager, cacheDependencyPath);
                }
                catch (error) {
                    core.warning(`Restore cache failed: ${error.message}`);
@@ -88703,12 +88700,11 @@ function run() {
            // add problem matchers
            const matchersPath = path_1.default.join(__dirname, '../..', 'matchers.json');
            core.info(`##[add-matcher]${matchersPath}`);
-            core.setOutput('go-version', parsedGoVersion);
-            core.setOutput('go-path', goEnvJson['GOPATH']);
-            core.setOutput('go-cache', goEnvJson['GOCACHE']);
-            core.setOutput('go-mod-cache', goEnvJson['GOMODCACHE']);
-            core.setOutput('go-env', goEnvJson);
+            // output the version actually being used
+            core.info(goVersion);
+            core.setOutput('go-version', parseGoVersion(goVersion));
            core.startGroup('go env');
+            const goEnv = (child_process_1.default.execSync(`${goPath} env`) || '').toString();
            core.info(goEnv);
            core.endGroup();
        }
@@ -88756,16 +88752,6 @@ function parseGoVersion(versionString) {
    return versionString.split(' ')[2].slice('go'.length);
 }
 exports.parseGoVersion = parseGoVersion;
-function convertEnvStringToJson(envString) {
-    const envArray = envString.split('\n');
-    const envObject = {};
-    envArray.forEach(envVar => {
-        const [key, value] = envVar.split(/=(?=")/);
-        envObject[key] = value === null || value === void 0 ? void 0 : value.replace(/"/g, '');
-    });
-    return JSON.stringify(envObject);
-}
-exports.convertEnvStringToJson = convertEnvStringToJson;
 function resolveVersionInput() {
    let version = core.getInput('go-version');
    const versionFilePath = core.getInput('go-version-file');
--- a/package-lock.json
+++ b/package-lock.json
@@ -4559,12 +4559,12 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dev": true,
      "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
      },
      "engines": {
--- a/src/cache-restore.ts
+++ b/src/cache-restore.ts
@@ -15,6 +15,7 @@ export const restoreCache = async (
 ) => {
  const packageManagerInfo = await getPackageManagerInfo(packageManager);
  const platform = process.env.RUNNER_OS;
+  const arch = process.arch;

  const cachePaths = await getCacheDirectoryPath(packageManagerInfo);

@@ -31,7 +32,7 @@ export const restoreCache = async (

  const linuxVersion =
    process.env.RUNNER_OS === 'Linux' ? `${process.env.ImageOS}-` : '';
-  const primaryKey = `setup-go-${platform}-${linuxVersion}go-${versionSpec}-${fileHash}`;
+  const primaryKey = `setup-go-${platform}-${arch}-${linuxVersion}go-${versionSpec}-${fileHash}`;
  core.debug(`primary key is ${primaryKey}`);

  core.saveState(State.CachePrimaryKey, primaryKey);
--- a/src/cache-utils.ts
+++ b/src/cache-utils.ts
@@ -63,7 +63,13 @@ export function isGhes(): boolean {
  const ghUrl = new URL(
    process.env['GITHUB_SERVER_URL'] || 'https://github.com'
  );
-  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+
+  const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+  const isGitHubHost = hostname === 'GITHUB.COM';
+  const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+  const isLocalHost = hostname.endsWith('.LOCALHOST');
+
+  return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }

 export function isCacheFeatureAvailable(): boolean {
--- a/src/main.ts
+++ b/src/main.ts
@@ -63,23 +63,13 @@ export async function run() {

    const goPath = await io.which('go');
    const goVersion = (cp.execSync(`${goPath} version`) || '').toString();
-    const goEnv = (cp.execSync(`${goPath} env`) || '').toString();
-    const goEnvJson = JSON.parse(convertEnvStringToJson(goEnv));
-    const parsedGoVersion = parseGoVersion(goVersion);
-
-    // Go versions less that 1.16 do not have the GOVERSION environment variable
-    if (semver.lt(parsedGoVersion, '1.16.0')) {
-      goEnvJson['GOVERSION'] = 'go' + parsedGoVersion;
-    }
-
-    core.info(goVersion);

    if (cache && isCacheFeatureAvailable()) {
      const packageManager = 'default';
      const cacheDependencyPath = core.getInput('cache-dependency-path');
      try {
        await restoreCache(
-          parsedGoVersion,
+          parseGoVersion(goVersion),
          packageManager,
          cacheDependencyPath
        );
@@ -92,13 +82,13 @@ export async function run() {
    const matchersPath = path.join(__dirname, '../..', 'matchers.json');
    core.info(`##[add-matcher]${matchersPath}`);

-    core.setOutput('go-version', parsedGoVersion);
-    core.setOutput('go-path', goEnvJson['GOPATH']);
-    core.setOutput('go-cache', goEnvJson['GOCACHE']);
-    core.setOutput('go-mod-cache', goEnvJson['GOMODCACHE']);
-    core.setOutput('go-env', goEnvJson);
+    // output the version actually being used
+    core.info(goVersion);
+
+    core.setOutput('go-version', parseGoVersion(goVersion));

    core.startGroup('go env');
+    const goEnv = (cp.execSync(`${goPath} env`) || '').toString();
    core.info(goEnv);
    core.endGroup();
  } catch (error) {
@@ -145,18 +135,6 @@ export function parseGoVersion(versionString: string): string {
  return versionString.split(' ')[2].slice('go'.length);
 }

-export function convertEnvStringToJson(envString: string): string {
-  const envArray = envString.split('\n');
-  const envObject: {[key: string]: string} = {};
-
-  envArray.forEach(envVar => {
-    const [key, value] = envVar.split(/=(?=")/);
-    envObject[key] = value?.replace(/"/g, '');
-  });
-
-  return JSON.stringify(envObject);
-}
-
 function resolveVersionInput(): string {
  let version = core.getInput('go-version');
  const versionFilePath = core.getInput('go-version-file');
Author	SHA1	Message	Date
Priya Gupta	41dfa10bad	Enhance workflows and Upgrade micromatch Dependency (#510 ) * Update workflows and bump dependencies * Add test for Go 1.22 and 1.23 * Update Go versions in local-cache setup and include macos-latest with ARM64 architecture	2024-10-23 22:39:31 -05:00
John Wesley Walker III	941977282c	Revise `isGhes` logic (#511 ) * Revise `isGhes` logic * ran `npm run format` * added unit test * tweaked unit test * ran `npm run format`	2024-10-21 11:56:08 -05:00
Joel Ambass	d60b41a563	Merge pull request #502 from actions/Jcambass-patch-1 Upgrade IA Publish	2024-09-26 08:24:19 +02:00
Joel Ambass	e09f57f6a9	Upgrade IA Publish	2024-09-16 17:20:25 +02:00
Joel Ambass	df1a11710e	Merge pull request #500 from actions/Jcambass-patch-1 Add workflow file for publishing releases to immutable action package	2024-09-11 10:48:12 +02:00
Joel Ambass	49582f6476	Add workflow file for publishing releases to immutable action package This workflow file publishes new action releases to the immutable action package of the same name as this repo. This is part of the Immutable Actions project which is not yet fully released to the public. First party actions like this one are part of our initial testing of this feature.	2024-09-11 10:43:06 +02:00
Zxilly	b26d40294f	fix: add arch to cache key (#493 )	2024-08-26 15:19:57 -05:00