Merge 5993da79df into 48b90677b6

Add macos-13 to the workflows and upgrade publish-actions from 0.2.2 to 0.3.0 (#1174 )
* Update versions.yml * Update versions.yml * ubuntu-24, macos-13 updates * check -failure fix
2026-07-05 16:03:53 +08:00 · 2024-12-19 14:55:10 +01:00 · 2024-12-18 11:43:06 -06:00 · 2024-12-13 23:44:39 -08:00
8 changed files with 35 additions and 34 deletions
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.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]
        node-version: [18, 20, 22]
    steps:
      - uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18, 20, 22]
    steps:
      - uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18, 20]
    steps:
      - uses: actions/checkout@v4
@@ -106,7 +106,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18, 20, 22]
    steps:
      - uses: actions/checkout@v4
--- 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
@@ -17,7 +17,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18, 20, 22]
    steps:
      - uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version:
          [
            '20-v8-canary',
@@ -81,7 +81,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version:
          [20.11.0-nightly202312211a0be537da, 21-nightly, 18.0.0-nightly]
    steps:
@@ -102,7 +102,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [20.0.0-rc.1, 18.0.0-rc.2, 19.0.0-rc.0]
    steps:
      - uses: actions/checkout@v4
@@ -122,7 +122,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18.20.0, 20.10.0, 22.0.0]
    steps:
      - uses: actions/checkout@v4
@@ -139,7 +139,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [18, 20, 22]
    steps:
      - uses: actions/checkout@v4
@@ -157,7 +157,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version-file:
          [.nvmrc, .tool-versions, .tool-versions-node, package.json]
    steps:
@@ -174,7 +174,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 node from node version file
@@ -189,7 +189,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 node from node version file
@@ -204,7 +204,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [17, 19]
    steps:
      - uses: actions/checkout@v4
@@ -251,7 +251,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
        node-version: [current, latest, node]
    steps:
      - name: Get node version
--- a/tests/cache-restore.test.ts
+++ b/tests/cache-restore.test.ts
@@ -115,7 +115,7 @@ describe('cache-restore', () => {
    it.each([['npm7'], ['npm6'], ['pnpm6'], ['yarn1'], ['yarn2'], ['random']])(
      'Throw an error because %s is not supported',
      async packageManager => {
-        await expect(restoreCache(packageManager, '')).rejects.toThrow(
+        await expect(restoreCache(packageManager, '', '')).rejects.toThrow(
          `Caching for '${packageManager}' is not supported`
        );
      }
@@ -124,13 +124,13 @@ describe('cache-restore', () => {

  describe('Restore dependencies', () => {
    it.each([
-      ['yarn', '2.1.2', yarnFileHash],
-      ['yarn', '1.2.3', yarnFileHash],
-      ['npm', '', npmFileHash],
-      ['pnpm', '', pnpmFileHash]
+      ['yarn', '2.1.2', yarnFileHash, '22'],
+      ['yarn', '1.2.3', yarnFileHash, '20.17'],
+      ['npm', '', npmFileHash, '22.12'],
+      ['pnpm', '', pnpmFileHash, '18']
    ])(
      'restored dependencies for %s',
-      async (packageManager, toolVersion, fileHash) => {
+      async (packageManager, toolVersion, fileHash, nodeVersion) => {
        getCommandOutputSpy.mockImplementation((command: string) => {
          if (command.includes('version')) {
            return toolVersion;
@@ -139,10 +139,10 @@ describe('cache-restore', () => {
          }
        });

-        await restoreCache(packageManager, '');
+        await restoreCache(packageManager, '', nodeVersion);
        expect(hashFilesSpy).toHaveBeenCalled();
        expect(infoSpy).toHaveBeenCalledWith(
-          `Cache restored from key: node-cache-${platform}-${arch}-${packageManager}-${fileHash}`
+          `Cache restored from key: node-cache-${platform}-${arch}-${nodeVersion}-${packageManager}-${fileHash}`
        );
        expect(infoSpy).not.toHaveBeenCalledWith(
          `${packageManager} cache is not found`
@@ -170,7 +170,7 @@ describe('cache-restore', () => {
        });

        restoreCacheSpy.mockImplementationOnce(() => undefined);
-        await restoreCache(packageManager, '');
+        await restoreCache(packageManager, '', '');
        expect(hashFilesSpy).toHaveBeenCalled();
        expect(infoSpy).toHaveBeenCalledWith(
          `${packageManager} cache is not found`
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -93306,7 +93306,7 @@ const fs_1 = __importDefault(__nccwpck_require__(7147));
 const os_1 = __importDefault(__nccwpck_require__(2037));
 const constants_1 = __nccwpck_require__(9042);
 const cache_utils_1 = __nccwpck_require__(1678);
-const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () {
+const restoreCache = (packageManager, cacheDependencyPath, nodeVersion) => __awaiter(void 0, void 0, void 0, function* () {
    const packageManagerInfo = yield (0, cache_utils_1.getPackageManagerInfo)(packageManager);
    if (!packageManagerInfo) {
        throw new Error(`Caching for '${packageManager}' is not supported`);
@@ -93322,7 +93322,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
    if (!fileHash) {
        throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
    }
-    const keyPrefix = `node-cache-${platform}-${arch}-${packageManager}`;
+    const keyPrefix = `node-cache-${platform}-${arch}-${nodeVersion}-${packageManager}`;
    const primaryKey = `${keyPrefix}-${fileHash}`;
    core.debug(`primary key is ${primaryKey}`);
    core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
@@ -94472,7 +94472,7 @@ function run() {
            if (cache && (0, cache_utils_1.isCacheFeatureAvailable)()) {
                core.saveState(constants_1.State.CachePackageManager, cache);
                const cacheDependencyPath = core.getInput('cache-dependency-path');
-                yield (0, cache_restore_1.restoreCache)(cache, cacheDependencyPath);
+                yield (0, cache_restore_1.restoreCache)(cache, cacheDependencyPath, version);
            }
            const matchersPath = path.join(__dirname, '../..', '.github');
            core.info(`##[add-matcher]${path.join(matchersPath, 'tsc.json')}`);
--- a/package-lock.json
+++ b/package-lock.json
@@ -2588,9 +2588,9 @@
      }
    },
    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
      "dev": true,
      "dependencies": {
        "path-key": "^3.1.0",
--- a/src/cache-restore.ts
+++ b/src/cache-restore.ts
@@ -15,7 +15,8 @@ import {

 export const restoreCache = async (
  packageManager: string,
-  cacheDependencyPath: string
+  cacheDependencyPath: string,
+  nodeVersion: string
 ) => {
  const packageManagerInfo = await getPackageManagerInfo(packageManager);
  if (!packageManagerInfo) {
@@ -40,7 +41,7 @@ export const restoreCache = async (
    );
  }

-  const keyPrefix = `node-cache-${platform}-${arch}-${packageManager}`;
+  const keyPrefix = `node-cache-${platform}-${arch}-${nodeVersion}-${packageManager}`;
  const primaryKey = `${keyPrefix}-${fileHash}`;
  core.debug(`primary key is ${primaryKey}`);

--- a/src/main.ts
+++ b/src/main.ts
@@ -62,7 +62,7 @@ export async function run() {
    if (cache && isCacheFeatureAvailable()) {
      core.saveState(State.CachePackageManager, cache);
      const cacheDependencyPath = core.getInput('cache-dependency-path');
-      await restoreCache(cache, cacheDependencyPath);
+      await restoreCache(cache, cacheDependencyPath, version);
    }

    const matchersPath = path.join(__dirname, '../..', '.github');
Author	SHA1	Message	Date
Clinton Blackburn	971109febb	Merge `5993da79df` into `48b90677b6`	2024-12-19 14:55:10 +01:00
aparnajyothi-y	48b90677b6	Add macos-13 to the workflows and upgrade publish-actions from 0.2.2 to 0.3.0 (#1174 ) * Update versions.yml * Update versions.yml * ubuntu-24, macos-13 updates * check -failure fix	2024-12-18 11:43:06 -06:00
Clinton Blackburn	5993da79df	Added Node version to cache key	2024-12-13 23:44:39 -08:00