Merge 09158c28ef 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-03-04 06:51:04 +08:00 · 2024-12-19 10:07:51 +08:00 · 2024-12-18 11:43:06 -06:00 · 2024-09-10 10:44:45 +08:00
5 changed files with 20 additions and 32 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/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
@ -46,19 +46,7 @@ export const restoreCache = async (

  core.saveState(State.CachePrimaryKey, primaryKey);

-  const isManagedByYarnBerry = await repoHasYarnBerryManagedDependencies(
-    packageManagerInfo,
-    cacheDependencyPath
-  );
-  let cacheKey: string | undefined;
-  if (isManagedByYarnBerry) {
-    core.info(
-      'All dependencies are managed locally by yarn3, the previous cache can be used'
-    );
-    cacheKey = await cache.restoreCache(cachePaths, primaryKey, [keyPrefix]);
-  } else {
-    cacheKey = await cache.restoreCache(cachePaths, primaryKey);
-  }
+  const cacheKey = await cache.restoreCache(cachePaths, primaryKey, [keyPrefix]);

  core.setOutput('cache-hit', Boolean(cacheKey));
Author	SHA1	Message	Date
leavesster	4003d5e105	Merge `09158c28ef` into `48b90677b6`	2024-12-19 10:07:51 +08: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
yleaf	09158c28ef	fix: add restore key for all package managers	2024-09-10 10:44:45 +08:00