diff --git a/.cirrus.yml b/.cirrus.yml index dd73ca7dc..56ff1ceca 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -163,14 +163,14 @@ macos_task_template: &MACOS_TASK_TEMPLATE pip_cache: folder: ${PIP_CACHE_DIR} install_script: - - echo $PATH - - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - - echo $PATH - clang --version - find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - sudo xcode-select -p - brew update > /dev/null - brew install --force qt6 coreutils ccache qbs cmake + - echo $PATH + - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" + - echo $PATH - chmod -R 755 /opt/homebrew/opt/qt6/* - python3 --version - pip3 install --user --upgrade pip dropbox conan==1.59 diff --git a/appveyor.yml b/appveyor.yml index 0290b8ed7..f4de41e10 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -501,9 +501,6 @@ for: - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) init: - - export QTDIR="$QT" - - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH" - - echo $PATH - find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - sudo xcode-select -p - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app @@ -514,6 +511,9 @@ for: - rm '/usr/local/bin/cpack' - rm '/usr/local/bin/ctest' - brew install --force coreutils qbs cmake + - export QTDIR="$QT" + - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH" + - echo $PATH - python3 --version - | if [[ "$ENABLE_CONAN" == "true" ]]; then