[ci] Build fixes

ossia · Apr 5, 2024 · 12dc902 · 12dc902
1 parent 9388ddb
commit 12dc902
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/.github/actions/mac-codesign/action.yml b/.github/actions/mac-codesign/action.yml
@@ -59,7 +59,7 @@ runs:
           xcrun notarytool submit "codesign.zip" \
           --team-id "GRW9MHZ724" \
           --apple-id "[email protected]" \
-          --password "@env:MAC_ALTOOL_PASSWORD" \
+          --password "$MAC_ALTOOL_PASSWORD" \
           --progress \
           --wait
 

diff --git a/.github/workflows/libossia.yml b/.github/workflows/libossia.yml
@@ -125,9 +125,6 @@ jobs:
         BUILD_TYPE: ${{ matrix.build_type }}
       run: |
         export CTEST_OUTPUT_ON_FAILURE=1
-        # export RPI_ROOT_PATH=/opt/cross-pi-gcc
-        # export PKG_CONFIG_SYSROOT_DIR=$RPI_ROOT_PATH
-        # export PKG_CONFIG_LIBDIR=${RPI_ROOT_PATH}/usr/lib/pkgconfig:${RPI_ROOT_PATH}/usr/share/pkgconfig:${RPI_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig/
         export PATH=/opt/cross-pi-gcc/bin:${PATH}
         export LD_LIBRARY_PATH=/opt/cross-pi-gcc/lib:${LD_LIBRARY_PATH}
 

diff --git a/.github/workflows/ossia-pd.yml b/.github/workflows/ossia-pd.yml
@@ -115,13 +115,11 @@ jobs:
     - name: Build
       run: |
         export CTEST_OUTPUT_ON_FAILURE=1
-        export RPI_ROOT_PATH=/opt/cross-pi-gcc
-        export PKG_CONFIG_SYSROOT_DIR=$RPI_ROOT_PATH
-        export PKG_CONFIG_LIBDIR=${RPI_ROOT_PATH}/usr/lib/pkgconfig:${RPI_ROOT_PATH}/usr/share/pkgconfig:${RPI_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/pkgconfig/
         export PATH=/opt/cross-pi-gcc/bin:${PATH}
         export LD_LIBRARY_PATH=/opt/cross-pi-gcc/lib:${LD_LIBRARY_PATH}
 
-        cmake -B build -S ${GITHUB_WORKSPACE} -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}/cmake/toolchain/arm-linux-gnueabihf.cmake" \
+        cmake -B build -S ${GITHUB_WORKSPACE} \
+            -DCMAKE_TOOLCHAIN_FILE="/opt/cross-pi-gcc/aarch64-rpi3-linux-gnu.toolchain.cmake" \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=install \
             -DOSSIA_CI=1 \

diff --git a/src/ossia-max/CMakeLists.txt b/src/ossia-max/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 if(Git_FOUND)
 if(${MAXSDK_PATH} STREQUAL "${OSSIA_3RDPARTY_FOLDER}/max-sdk")
   execute_process(
-      COMMAND Git::Git submodule update --init -- ${OSSIA_3RDPARTY_FOLDER}/max-sdk
+      COMMAND "${GIT_EXECUTABLE}" submodule update --init -- ${OSSIA_3RDPARTY_FOLDER}/max-sdk
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       COMMAND_ERROR_IS_FATAL ANY)
 endif()