Fix macOS cache support

.github/workflows/test-cache.yml

@@ -23,7 +23,7 @@ jobs:
  version: '0.11.0'
  enable-cache: true
  working-directory: __tests__/fixtures/rye-project
- cache-prefix: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
+ cache-prefix: ${{ github.run_id }}-${{ github.run_attempt }}
  - run: rye sync
  working-directory: __tests__/fixtures/rye-project
  test-restore-cache:
@@ -41,7 +41,7 @@ jobs:
  version: '0.11.0'
  enable-cache: true
  working-directory: __tests__/fixtures/rye-project
- cache-prefix: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
+ cache-prefix: ${{ github.run_id }}-${{ github.run_attempt }}
  - name: Cache was hit
  run: |
  if [ "$CACHE_HIT" != "true" ]; then

.github/workflows/test-latest-scheduled.yml

@@ -19,6 +19,14 @@ jobs:
  os: [ubuntu-latest, macos-latest, macos-14, oracle-aarch64]
  steps:
  - uses: actions/checkout@v4
+ - name: Should not be on path
+ run: |
+ if ! which rye;
+ then
+ exit 0
+ else
+ exit 1
+ fi
  - name: Setup rye
  uses: ./
  - run: rye sync

.github/workflows/test.yml

@@ -24,25 +24,6 @@ jobs:
  npm install
  - run: |
  npm run all
- test-latest:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- os: [ubuntu-latest, macos-latest, macos-14, oracle-aarch64]
- steps:
- - uses: actions/checkout@v4
- - name: Should not be on path
- run: |
- if ! which rye;
- then
- exit 0
- else
- exit 1
- fi
- - name: Install latest
- uses: ./
- - run: |
- which rye
  test-specific-version:
  runs-on: ${{ matrix.os }}
  strategy:

src/restore-cache.ts

@@ -5,7 +5,7 @@ import * as core from '@actions/core'
 import {cp} from '@actions/io/'
 import {exists} from '@actions/io/lib/io-util'
 
-import {getLinuxInfo} from './utils'
+import {IS_MAC, getLinuxInfo, getMacOSInfo} from './utils'
 
 export const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key'
 export const STATE_CACHE_MATCHED_KEY = 'cache-matched-key'
@@ -54,7 +54,7 @@ async function computeKeys(
  const workingDirHash = workingDir
  ? `-${crypto.createHash('sha256').update(workingDir).digest('hex')}`
  : ''
- const osInfo = await getLinuxInfo()
+ const osInfo = IS_MAC ? await getMacOSInfo() : await getLinuxInfo()
  const prefix = cachePrefix ? `${cachePrefix}-` : ''
  const primaryKey = `${prefix}setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}-${dependencyPathHash}`
  const restoreKey = `${prefix}setup-rye-${process.env['RUNNER_OS']}-${osInfo.osVersion}-${osInfo.osName}-rye-${version}${workingDirHash}`

src/utils.ts

@@ -80,6 +80,19 @@ export function getArch(): Architecture | undefined {
  }
 }
 
+export async function getMacOSInfo(): Promise<{
+ osName: string
+ osVersion: string
+}> {
+ const {stdout} = await exec.getExecOutput('sw_vers', ['-productVersion'], {
+ silent: true
+ })
+
+ const macOSVersion = stdout.trim()
+
+ return {osName: 'macOS', osVersion: macOSVersion}
+}
+
 export async function getLinuxInfo(): Promise<{
  osName: string
  osVersion: string