Skip to content

Commit 32cdff9

Browse files
committed
fix macos ci, bump action versions
1 parent 5ab1c06 commit 32cdff9

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ jobs:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest, macos-latest]
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
17+
18+
- name: select xcode
19+
if: runner.os == 'macOS'
20+
run: sudo xcode-select -s /Applications/Xcode.app
1721

1822
- name: build and run tests
1923
run: |
@@ -29,12 +33,12 @@ jobs:
2933
matrix:
3034
os: [ubuntu-latest, windows-latest, macos-latest]
3135
steps:
32-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
3337
- uses: dtolnay/rust-toolchain@stable
3438
- uses: oven-sh/setup-bun@v2
3539

3640
- name: cache rust
37-
uses: actions/cache@v4
41+
uses: actions/cache@v5
3842
with:
3943
path: |
4044
~/.cargo/registry
@@ -44,7 +48,7 @@ jobs:
4448
restore-keys: ${{ runner.os }}-cargo-
4549

4650
- name: cache bun
47-
uses: actions/cache@v4
51+
uses: actions/cache@v5
4852
with:
4953
path: habaki/node_modules
5054
key: ${{ runner.os }}-bun-${{ hashFiles('habaki/bun.lock') }}
@@ -65,7 +69,7 @@ jobs:
6569
TAURI_SIGNING_PRIVATE_KEY: ""
6670

6771
- name: upload artifacts
68-
uses: actions/upload-artifact@v4
72+
uses: actions/upload-artifact@v7
6973
with:
7074
name: kashira-${{ runner.os }}
7175
path: |

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
matrix:
1212
os: [ubuntu-latest, windows-latest, macos-latest]
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- uses: dtolnay/rust-toolchain@stable
1616
- uses: oven-sh/setup-bun@v2
1717

1818
- name: cache rust
19-
uses: actions/cache@v4
19+
uses: actions/cache@v5
2020
with:
2121
path: |
2222
~/.cargo/registry
@@ -39,7 +39,7 @@ jobs:
3939
TAURI_SIGNING_PRIVATE_KEY: ""
4040

4141
- name: upload artifacts
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v7
4343
with:
4444
name: kashira-${{ runner.os }}
4545
path: |
@@ -55,7 +55,7 @@ jobs:
5555
permissions:
5656
contents: write
5757
steps:
58-
- uses: actions/download-artifact@v4
58+
- uses: actions/download-artifact@v8
5959
with:
6060
merge-multiple: true
6161

habaki/menuki/blades/wherespace/Wherespace.svelte

Whitespace-only changes.

habaki/src-tauri/blades/wherespace/scanner.cpp

Whitespace-only changes.

habaki/src-tauri/blades/wherespace/scanner.h

Whitespace-only changes.

habaki/src-tauri/blades/wherespace/tsuka.cpp

Whitespace-only changes.

habaki/src-tauri/blades/wherespace/tsuka.h

Whitespace-only changes.

tests/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ project(kashira-tests)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6-
if(APPLE)
7-
set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0")
8-
endif()
9-
106
include(FetchContent)
117
FetchContent_Declare(
128
Catch2

0 commit comments

Comments
 (0)