aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to conan 1.60.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-06-24 15:54:36 +03:00
parent 14d8bbb993
commit 2d512e57b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -175,7 +175,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- echo $PATH - echo $PATH
- chmod -R 755 /opt/homebrew/opt/qt6/* - chmod -R 755 /opt/homebrew/opt/qt6/*
- python3 --version - 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 - ccache --set-config=sloppiness=pch_defines,time_macros
- conan --version - conan --version
- qmake --version - qmake --version

4
appveyor.yml
View File

@ -393,7 +393,7 @@ for:
# Install the build dependencies of the project. # Install the build dependencies of the project.
- (python -m pip install --upgrade pip) - (python -m pip install --upgrade pip)
- if "%DEPLOY%" == "true" (python -m pip install dropbox) - 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 # Trick qmake to not work through MSYS
- del /F "C:\Program Files\Git\usr\bin\sh.exe" - del /F "C:\Program Files\Git\usr\bin\sh.exe"
- del /F "C:\Program Files\Git\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" - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
- echo $PATH - echo $PATH
- python3 --version - python3 --version
- pip3 install --user --upgrade pip dropbox conan==1.59 - pip3 install --user --upgrade pip dropbox conan==1.60
- conan --version - conan --version
- clang --version - clang --version
- qmake --version - qmake --version