diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7d1c7d6..7a1e8ec 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,26 +23,30 @@ jobs: cache: true modules: 'qt3d qtcharts qtconnectivity qtdatavis3d qtgraphs qtgrpc qthttpserver qtimageformats qtlanguageserver qtlocation qtlottie qtmultimedia qtnetworkauth qtpdf qtpositioning qtquick3dphysics qtquickeffectmaker qtremoteobjects qtscxml qtsensors qtserialbus qtserialport qtspeech qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qt5compat qtquick3d qtquicktimeline qtshadertools' - name: Install QCoro - 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 + uses: theCheeseboard/actions/build-cmake-project@actions + 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