Update macOS CI

theCheeseboard · Apr 12, 2024 · 345a09c · 345a09c
1 parent 3913926
commit 345a09c
Showing 1 changed file with 15 additions and 23 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -27,26 +27,18 @@ jobs:
         with:
           project: danvratil/qcoro
           commitish: v0.10.0
-      #   run: |
-      #     git clone https://github.com/danvratil/qcoro.git
-      #     cmake -S qcoro -B build-qcoro -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_INSTALL_PREFIX=$HOME/install -DCMAKE_PREFIX_PATH=$HOME/install/lib -DCMAKE_INSTALL_RPATH=$HOME/install/lib
-      #     cmake --build build-qcoro
-      #     cmake --install build-qcoro
-      # - name: Install libcontemporary
-      #   run: |
-      #     git clone https://github.com/theCheeseboard/libcontemporary.git
-      #     cmake -S libcontemporary -B build-libcontemporary -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_INSTALL_PREFIX=$HOME/install -DCMAKE_PREFIX_PATH=$HOME/install/lib -DCMAKE_INSTALL_RPATH=$HOME/install/lib
-      #     cmake --build build-libcontemporary
-      #     cmake --install build-libcontemporary
-      # - name: Install contemporary-qml
-      #   run: |
-      #     git clone https://github.com/theCheeseboard/contemporary-qml.git
-      #     cmake -S contemporary-qml -B build-contemporary-qml -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_INSTALL_PREFIX=$HOME/install -DCMAKE_PREFIX_PATH=$HOME/install/lib -DCMAKE_INSTALL_RPATH=$HOME/install/lib
-      #     cmake --build build-contemporary-qml
-      #     cmake --install build-contemporary-qml
-      # - name: Install theterminal
-      #   run: |
-      #     git clone https://github.com/theCheeseboard/theterminal.git
-      #     cmake -S theterminal -B build-theterminal -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_INSTALL_PREFIX=$HOME/install -DCMAKE_PREFIX_PATH=$HOME/install/lib -DCMAKE_INSTALL_RPATH=$HOME/install/lib
-      #     cmake --build build-theterminal
-      #     cmake --install build-theterminal
+      - name: Install libcontemporary
+        uses: theCheeseboard/actions/build-cmake-project@actions
+        with:
+          project: theCheeseboard/libcontemporary
+          commitish: features/qml
+      - name: Install contemporary-qml
+        uses: theCheeseboard/actions/build-cmake-project@actions
+        with:
+          project: theCheeseboard/contemporary-qml
+          commitish: main
+      - name: Install theterminal
+        uses: theCheeseboard/actions/build-cmake-project@actions
+        with:
+          project: .
+          commitish: .