[ci] Update wokflow with avendish

celtera · Oct 2, 2023 · 8ba743f · 8ba743f
1 parent 0bd5ff9
commit 8ba743f
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -23,8 +23,9 @@ jobs:
               debug_flags: "-DCMAKE_BUILD_TYPE=Debug",
               release_flags: "-DCMAKE_BUILD_TYPE=Release",
               build_flags: "",
-              dependencies: "choco install ninja",
+              dependencies: "choco install -y ninja",
               sdk: "/c/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "Ubuntu (clang)",
@@ -46,6 +47,7 @@ jobs:
                              sudo apt update ; \
                              sudo apt install ninja-build clang-16 lld-16 libc++-16-dev libc++1-16 libc++abi1-16 libc++abi-16-dev",
               sdk: "/opt/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "Ubuntu (GCC)",
@@ -61,6 +63,7 @@ jobs:
                              sudo apt update ; \
                              sudo apt install ninja-build gcc-13 g++-13",
               sdk: "/opt/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "macOS",
@@ -70,14 +73,15 @@ jobs:
               release_flags: "-DCMAKE_BUILD_TYPE=Release",
               build_flags: "",
               sdk: "/opt/ossia-sdk-x86_64",
+              pre_build: "sudo xcode-select -s /Applications/Xcode_15.0.app"
             }
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Checkout dependencies
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: ossia/score
           submodules: "recursive"
@@ -95,6 +99,13 @@ jobs:
           chmod +x ./fetch-sdk.sh
           ./fetch-sdk.sh
 
+      - name: Checkout Max SDK
+        uses: actions/checkout@v4
+        with:
+          repository: jcelerier/max-sdk-base
+          submodules: "recursive"
+          path: max-sdk-base
+
       - name: Build debug
         shell: bash
         run: |
@@ -105,15 +116,18 @@ jobs:
             export PATH=${{ matrix.config.path }}:$PATH
           fi
 
+          export MAX_SDK=$PWD/../max-sdk-base
           export SDK_3RDPARTY=$PWD/../score/3rdparty
           export VERBOSE=1
 
+          ${{ matrix.config.pre_build }}
+
           cmake .. \
             -DBOOST_ROOT=${{ matrix.config.sdk }}/boost \
             -Dpybind11_DIR="$SDK_3RDPARTY/libossia/3rdparty/pybind11" \
-            -DAVND_MAXSDK_PATH="$SDK_3RDPARTY/libossia/3rdparty/max-sdk" \
+            -DAVND_MAXSDK_PATH=$MAX_SDK \
             -DVST3_SDK_ROOT="$SDK_3RDPARTY/vst3" \
-            -DCMAKE_PREFIX_PATH="$SDK_3RDPARTY/libpd/pure-data/src" \
+            -DCMAKE_PREFIX_PATH="$SDK_3RDPARTY/libpd/pure-data/src;$SDK_3RDPARTY/libossia/3rdparty/pybind11" \
             ${{ matrix.config.common_flags }} \
             ${{ matrix.config.debug_flags }}
 
@@ -129,13 +143,16 @@ jobs:
             export PATH=${{ matrix.config.path }}:$PATH
           fi
 
+          export MAX_SDK=$PWD/../max-sdk-base
           export SDK_3RDPARTY=$PWD/../score/3rdparty
           export VERBOSE=1
 
+          ${{ matrix.config.pre_build }}
+
           cmake .. \
             -DBOOST_ROOT="${{ matrix.config.sdk }}/boost" \
             -Dpybind11_DIR="$SDK_3RDPARTY/libossia/3rdparty/pybind11" \
-            -DAVND_MAXSDK_PATH="$SDK_3RDPARTY/libossia/3rdparty/max-sdk" \
+            -DAVND_MAXSDK_PATH=$MAX_SDK \
             -DVST3_SDK_ROOT="$SDK_3RDPARTY/vst3" \
             -DCMAKE_PREFIX_PATH="$SDK_3RDPARTY/libpd/pure-data/src;$SDK_3RDPARTY/libossia/3rdparty/pybind11" \
             ${{ matrix.config.common_flags }} \