diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile deleted file mode 100644 index 2cfcf6dd..00000000 --- a/.ci/macos/Brewfile +++ /dev/null @@ -1,12 +0,0 @@ - -brew "python3" -brew "pkg-config" -brew "clang-format" -brew "cmake" -brew "ninja" -brew "openssl" -# brew "qt6" -brew "nlohmann-json" -brew "gstreamer" -brew "qtkeychain" -brew "pipx" diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index e6e4fdaa..1a2d12f1 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -23,8 +23,6 @@ cmake -GNinja -S. -Bbuild \ -DHUNTER_ROOT="../.hunter" \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ - -DUSE_BUNDLED_OPENSSL=ON \ - -DUSE_BUNDLED_KDSINGLEAPPLICATION=ON -DKDSingleApplication_STATIC=ON \ -DQt6_DIR=${QT_BASEPATH}/lib/cmake \ -DCI_BUILD=ON cmake --build build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d84f1927..d3011639 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,7 +269,7 @@ build-macos-as: image: ghcr.io/cirruslabs/macos-sequoia-xcode:16.1 tags: [macos-tart] before_script: - - brew bundle --file .ci/macos/Brewfile + - brew install python3 pkg-config clang-format cmake ninja openssl gstreamer pipx - pipx install aqtinstall - pipx ensurepath - . ~/.zshrc