Skip to content

Commit 44f8e06

Browse files
committed
GHA: updated Windows and macOS runners.
1 parent e56fcbe commit 44f8e06

4 files changed

Lines changed: 18 additions & 7 deletions

File tree

.github/workflows/binaries.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- name: 'Windows'
14+
- name: 'Windows (Intel)'
1515
os: windows-2022
1616
buildcache_ext: .exe
17-
archive_extra: windows
17+
archive_extra: windows-intel
18+
- name: 'Windows (ARM)'
19+
os: windows-11-arm
20+
buildcache_ext: .exe
21+
archive_extra: windows-arm
1822
- name: 'Linux (Intel)'
1923
os: ubuntu-22.04
2024
archive_extra: linux-intel
2125
- name: 'Linux (ARM)'
2226
os: ubuntu-22.04-arm
2327
archive_extra: linux-arm
2428
- name: 'macOS (Intel)'
25-
os: macos-13
29+
os: macos-15-intel
2630
archive_extra: macos-intel
2731
- name: 'macOS (ARM)'
28-
os: macos-14
32+
os: macos-15
2933
archive_extra: macos-arm
3034
env:
3135
BUILDCACHE_VERSION: 0.31.5

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
strategy:
2626
matrix:
27-
os: [windows-2022, ubuntu-22.04, ubuntu-22.04-arm, macos-14]
27+
os: [windows-2022, windows-11-arm, ubuntu-22.04, ubuntu-22.04-arm, macos-15-intel, macos-15]
2828
steps:
2929
- uses: actions/checkout@v4
3030
- uses: ./

.github/workflows/unused/react-native-build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: # rebuild any PRs and main branch changes
88

99
jobs:
1010
compile:
11-
runs-on: macos-14
11+
runs-on: macos-15
1212
timeout-minutes: 60
1313
env:
1414
BUILDCACHE_DIR: ../custom_buildcache_dir # will override default location

src/restore.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@ import {
2121
// returns path to the downloaded file
2222
export async function downloadLatest(): Promise<string> {
2323
// Determine correct file name
24-
let filename = 'buildcache-windows.tar.gz' // our default
24+
let filename = ''
2525
switch (os.platform()) {
26+
case 'win32':
27+
if (os.arch() === 'x64') {
28+
filename = 'buildcache-windows-intel.tar.gz'
29+
} else {
30+
filename = 'buildcache-windows-arm.tar.gz'
31+
}
32+
break
2633
case 'linux':
2734
if (os.arch() === 'x64') {
2835
filename = 'buildcache-linux-intel.tar.gz'

0 commit comments

Comments
 (0)