Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI to Macos 14 #1976

Merged
merged 5 commits into from
Feb 4, 2024
Merged

Update CI to Macos 14 #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a84bc6
Update to macos 14 (m1)
kamilsa Jan 31, 2024
595eafe
Update rust, remove llvm dep in macos build
kamilsa Jan 31, 2024
0b0337f
Merge remote-tracking branch 'origin/master' into ci/update-macos
kamilsa Feb 4, 2024
04a55a4
Use ninja
kamilsa Feb 4, 2024
88ba6a1
Use ninja
kamilsa Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:

jobs:
MacOS:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
- uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
Expand All @@ -42,7 +42,7 @@ jobs:
env:
KAGOME_MAC_CI: 1
- name: build
run: ./housekeeping/make_build.sh -DCLEAR_OBJS=ON -DCOVERAGE=OFF -DWASM_COMPILER=WasmEdge -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/cxx20.cmake
run: ./housekeeping/make_build.sh -G Ninja -DCLEAR_OBJS=ON -DCOVERAGE=OFF -DWASM_COMPILER=WasmEdge -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/cxx20.cmake
env:
KAGOME_IN_DOCKER: 0
KAGOME_MAC_CI: 1
Expand Down
4 changes: 2 additions & 2 deletions housekeeping/macos/dependency.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ fi
sudo python3 -m pip install --upgrade pip
sudo python3 -m pip install scikit-build
sudo python3 -m pip install cmake==3.25 requests gitpython gcovr
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2022-11-20 --profile minimal

brew install llvm@12
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.75.0 --profile minimal
brew install ninja
Loading