chore: Updated OSX action

GeniusVentures · May 20, 2024 · 9547b01 · 9547b01
1 parent bdd62c0
commit 9547b01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/.github/workflows/OSX-cmake.yml b/.github/workflows/OSX-cmake.yml
@@ -1,33 +1,24 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Mac OSX Build
 
-# Controls when the workflow will run
-# Triggers the workflow on push or pull request events and manually from the Actions tab
 on:
   push:
     branches:
       - master
     paths-ignore:
-      - 'README.md'
-      - '.github/workflows/**'
-      - '.gitignore'
+      - "README.md"
+      - ".github/workflows/**"
+      - ".gitignore"
   pull_request:
   workflow_dispatch:
 
-env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 8
-
 jobs:
   MacOS:
-    env:
-      MAKEFLAGS: "-j 8"
     runs-on: macos-latest
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       # Workaround for arm64 build
       - name: Ensure latest macOS SDK is used
@@ -37,23 +28,15 @@ jobs:
 
       - name: Install Rust dependencies
         run: |
-          rustup update
-          rustup toolchain install stable
-          rustup default stable
           rustup target add x86_64-apple-darwin
           rustup target add aarch64-apple-darwin
           rustup target add wasm32-unknown-emscripten
-          cargo install cbindgen cargo-lipo
 
-      - name: Create Build Directory
-        run: |
-          cmake -E make_directory ${{github.workspace}}/.build
+      - name: Install bindgen
+        run: cargo install cbindgen cargo-lipo
 
       - name: Configure CMake
-        working-directory: ${{github.workspace}}/.build
-        run: cmake -S ../build/OSX/ -DCMAKE_BUILD_TYPE=Release
+        run: cmake -S build/OSX -B build/OSX/Release -DCMAKE_BUILD_TYPE=Release
 
       - name: Compile
-        working-directory: ${{github.workspace}}/.build
-        run: make
-
+        run: cmake --build build/OSX/Release --config Release --parallel
diff --git a/build/Android/CMakeLists.txt b/build/Android/CMakeLists.txt
@@ -144,7 +144,6 @@ set(OPENSSL_VARIANT "$<$<CONFIG:Debug>:--debug >")
 set(_openssl_BUILD_ROOT "${CMAKE_CURRENT_BINARY_DIR}/openssl/build/Android/${ANDROID_ABI}")
 ExternalProject_Add(openssl
     PREFIX openssl
-    GIT_SHALLOW TRUE
     SOURCE_DIR "${THIRDPARTY_DIR}/openssl"
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/Openssl-build/build.sh ${OPENSSL_VARIANT}--abi=${_abi} --api-level=${ANDROID_NATIVE_API_LEVEL} --build-dir=${_openssl_BUILD_ROOT} --env_path=$ENV{PATH} --env_android_ndk=$ENV{ANDROID_NDK} --env_android_toolchain=$ENV{ANDROID_TOOLCHAIN}