Skip to content

Commit da5c4f0

Browse files
committed
[build]: Fixed CI for Xcode 16.2 and macOS-15
1 parent 4e51e7f commit da5c4f0

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
concurrency:
1010
group: ${{ github.ref }}
1111
cancel-in-progress: true
12-
runs-on: macos-12
12+
runs-on: macos-15
1313

1414
steps:
1515
- name: Checkout
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Xcode
3131
uses: maxim-lobanov/[email protected]
3232
with:
33-
xcode-version: 14.2
33+
xcode-version: 16.2
3434

3535
- name: Build
3636
run: make zip

Makefile

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SIDESTORE_REPO ?= ../SideStore
1+
SIDESTORE_REPO ?= ../../../SideStore
2+
# SIDESTORE_REPO ?= ../SideStore
23
SKIP_SIM ?= false
34
TARGET="minimuxer"
45

@@ -40,15 +41,16 @@ copy:
4041
@echo "SIDESTORE_REPO: $(SIDESTORE_REPO)"
4142

4243
@echo "copying libraries"
43-
@cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/Dependencies/minimuxer"
44-
@cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/Dependencies/minimuxer"
44+
@cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/SideStore/minimuxer"
45+
@cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/SideStore/minimuxer"
4546

4647
@echo "copying generated"
47-
@cp generated/* "$(SIDESTORE_REPO)/Dependencies/minimuxer"
48+
@cp generated/* "$(SIDESTORE_REPO)/SideStore/minimuxer"
4849

49-
@touch "$(SIDESTORE_REPO)/Dependencies/.skip-prebuilt-fetch-minimuxer"
50+
@touch "$(SIDESTORE_REPO)/SideStore/.skip-prebuilt-fetch-minimuxer"
5051

51-
build: compile copy
52+
# build: compile copy
53+
build: compile
5254

5355
clean:
5456
@echo "clean"

src/muxer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub static STARTED: AtomicBool = AtomicBool::new(false);
258258
pub static STARTED: AtomicBool = AtomicBool::new(true); // minimuxer won't start in tests
259259

260260
/// Starts the muxer and heartbeat client
261-
/// # Arguments\
261+
/// # Arguments
262262
/// Pairing file contents as a string and log path as a string
263263
pub fn start(pairing_file: String, log_path: String) -> crate::Res<()> {
264264
startWithLogger(pairing_file, log_path, true) // logging is enabled by default as before

0 commit comments

Comments
 (0)