From 0a84bc6c215c1386a3fb6e82b64c42586921248d Mon Sep 17 00:00:00 2001 From: kamilsa Date: Wed, 31 Jan 2024 19:27:21 +0600 Subject: [PATCH 1/4] Update to macos 14 (m1) --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 18f4dc7ead..0d04cebbbe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ env: jobs: MacOS: - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 - uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed From 595eafeac9896877163918ed1209ef741e74e30d Mon Sep 17 00:00:00 2001 From: kamilsa Date: Wed, 31 Jan 2024 19:35:54 +0600 Subject: [PATCH 2/4] Update rust, remove llvm dep in macos build --- housekeeping/macos/dependency.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/housekeeping/macos/dependency.sh b/housekeeping/macos/dependency.sh index 06ecb1a500..58e421f2e0 100755 --- a/housekeeping/macos/dependency.sh +++ b/housekeeping/macos/dependency.sh @@ -10,6 +10,4 @@ pip3 install --user pyyaml 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 From 04a55a495003508dcb6fae86b13f882fc6677408 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Sun, 4 Feb 2024 12:02:32 +0600 Subject: [PATCH 3/4] Use ninja --- housekeeping/macos/dependency.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/housekeeping/macos/dependency.sh b/housekeeping/macos/dependency.sh index 502bb0dbbb..55148577eb 100755 --- a/housekeeping/macos/dependency.sh +++ b/housekeeping/macos/dependency.sh @@ -14,4 +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 1.75.0 --profile minimal +brew install ninja From 88ba6a18b85112d8f675c738c3a1bfbb2832fa6b Mon Sep 17 00:00:00 2001 From: kamilsa Date: Sun, 4 Feb 2024 12:02:35 +0600 Subject: [PATCH 4/4] Use ninja --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcad5d2e7f..95ee535651 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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