Fix macos build (#925)

LedgerHQ · Dec 6, 2022 · aca5214 · aca5214
1 parent e2ff7ab
commit aca5214
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
@@ -3,8 +3,8 @@ set -euo pipefail
 
 mkdir _build_tests
 cd _build_tests
-cmake .. -DTARGET_JNI=${BUILD_JNI-OFF} -DBUILD_TESTS=ON -DNIX_BUILD=OFF -DCCACHE=ON -DSYS_OPENSSL=ON -DOPENSSL_USE_STATIC_LIBS=TRUE -GNinja
+cmake .. -DTARGET_JNI=${BUILD_JNI-OFF} -DBUILD_TESTS=ON -DNIX_BUILD=OFF -DCCACHE=ON -DSYS_OPENSSL=ON -DOPENSSL_USE_STATIC_LIBS=TRUE ${ARGS}
 echo "========= Building libcore"
-cmake --build . --parallel --target  ledger-core-static
-cmake --build . --parallel --target  ledger-core
-cmake --build . --parallel
+cmake --build . --target  ledger-core-static -- -j2
+cmake --build . --target  ledger-core -- -j2
+cmake --build . -- -j2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ on:
         description: "Build macos in JAR"
         required: true
         type: boolean
-        default: true
+        default: false
 jobs:
   Release:
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -52,6 +52,9 @@ jobs:
         max-size: "3G"
     - name: Build
       run: .github/scripts/build.sh
+      env:
+        OPENSSL_ROOT_DIR: /usr/local/opt/openssl/
+        ARGS: '-GNinja'
     - name: Tests
       if: env.BUILD_JNI == 'OFF'
       run: .github/scripts/test.sh
@@ -82,7 +85,6 @@ jobs:
           submodules: 'recursive'
       - name: Setup Macos
         run: |
-          brew install ninja
           brew install openssl
           brew install postgresql@13
           brew link --overwrite postgresql@13
@@ -101,6 +103,7 @@ jobs:
         run: .github/scripts/build.sh
         env:
           OPENSSL_ROOT_DIR: /usr/local/opt/openssl/
+          ARGS:
       - name: Tests
         if: env.BUILD_JNI == 'OFF'
         run: .github/scripts/test.sh