From 9e42631cb0448ebf9bd7272aeec6b6c36ada1d95 Mon Sep 17 00:00:00 2001
From: Joe Donofry <rubberduckie3554@gmail.com>
Date: Mon, 26 Feb 2024 03:17:19 +0000
Subject: [PATCH] Update 2 files
- /.gitlab-ci.yml
- /.ci/macos/Brewfile
---
.ci/macos/Brewfile | 1 +
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile
index 84036fede..171cc0a4f 100644
--- a/.ci/macos/Brewfile
+++ b/.ci/macos/Brewfile
@@ -10,3 +10,4 @@ brew "openssl"
brew "nlohmann_json"
brew "gstreamer"
brew "qtkeychain"
+brew "pipx"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83dc2abc8..7e7a34dfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -268,7 +268,7 @@ build-macos-as:
- brew update-reset
- unset HOMEBREW_NO_AUTO_UPDATE
- brew bundle --file .ci/macos/Brewfile
- - pip3 install aqtinstall
+ - pipx install aqtinstall
- mkdir $HOME/Qt
- aqt install-qt --outputdir $HOME/qt mac desktop 6.6 clang_64 -m qtlocation qtimageformats qtmultimedia qtpositioning qtshadertools
script:
@@ -279,7 +279,7 @@ build-macos-as:
.codesign-macos: &codesign_macos
stage: sign
before_script:
- - pip3 install dmgbuild
+ - pipx install dmgbuild
tags: [macos]
script:
- export QTPATH=(/Users/jdonof/Qt/6.*/macos/bin)
--
GitLab