Switch to conan 1.60.
This commit is contained in:
parent
14d8bbb993
commit
2d512e57b2
|
@ -175,7 +175,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- echo $PATH
|
||||
- chmod -R 755 /opt/homebrew/opt/qt6/*
|
||||
- python3 --version
|
||||
- pip3 install --user --upgrade pip dropbox conan==1.59
|
||||
- pip3 install --user --upgrade pip dropbox conan==1.60
|
||||
- ccache --set-config=sloppiness=pch_defines,time_macros
|
||||
- conan --version
|
||||
- qmake --version
|
||||
|
|
|
@ -393,7 +393,7 @@ for:
|
|||
# Install the build dependencies of the project.
|
||||
- (python -m pip install --upgrade pip)
|
||||
- if "%DEPLOY%" == "true" (python -m pip install dropbox)
|
||||
- python -m pip install conan==1.59
|
||||
- python -m pip install conan==1.60
|
||||
# Trick qmake to not work through MSYS
|
||||
- del /F "C:\Program Files\Git\usr\bin\sh.exe"
|
||||
- del /F "C:\Program Files\Git\bin\sh.exe"
|
||||
|
@ -577,7 +577,7 @@ for:
|
|||
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
|
||||
- echo $PATH
|
||||
- python3 --version
|
||||
- pip3 install --user --upgrade pip dropbox conan==1.59
|
||||
- pip3 install --user --upgrade pip dropbox conan==1.60
|
||||
- conan --version
|
||||
- clang --version
|
||||
- qmake --version
|
||||
|
|
Loading…
Reference in New Issue
Block a user