Skip to content

Commit

Permalink
[build]: Fixed CI for Xcode 16.2 and macOS-15
Browse files Browse the repository at this point in the history
  • Loading branch information
mahee96 committed Jan 14, 2025
1 parent 4e51e7f commit da5c4f0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
runs-on: macos-12
runs-on: macos-15

steps:
- name: Checkout
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/[email protected]
with:
xcode-version: 14.2
xcode-version: 16.2

- name: Build
run: make zip
Expand Down
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
SIDESTORE_REPO ?= ../SideStore
SIDESTORE_REPO ?= ../../../SideStore
# SIDESTORE_REPO ?= ../SideStore
SKIP_SIM ?= false
TARGET="minimuxer"

Expand Down Expand Up @@ -40,15 +41,16 @@ copy:
@echo "SIDESTORE_REPO: $(SIDESTORE_REPO)"

@echo "copying libraries"
@cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/Dependencies/minimuxer"
@cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/Dependencies/minimuxer"
@cp target/libminimuxer-ios.a "$(SIDESTORE_REPO)/SideStore/minimuxer"
@cp target/libminimuxer-sim.a "$(SIDESTORE_REPO)/SideStore/minimuxer"

@echo "copying generated"
@cp generated/* "$(SIDESTORE_REPO)/Dependencies/minimuxer"
@cp generated/* "$(SIDESTORE_REPO)/SideStore/minimuxer"

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

build: compile copy
# build: compile copy
build: compile

clean:
@echo "clean"
Expand Down
2 changes: 1 addition & 1 deletion src/muxer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ pub static STARTED: AtomicBool = AtomicBool::new(false);
pub static STARTED: AtomicBool = AtomicBool::new(true); // minimuxer won't start in tests

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

0 comments on commit da5c4f0

Please sign in to comment.