From d947c569a44aafa9adb64f023af35f72fad91ef4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 22 Sep 2023 15:26:43 +0300 Subject: [PATCH] Update conan requirements. --- .cirrus.yml | 2 +- appveyor.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8a5654d00..a66ee0abd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -237,7 +237,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - chmod -R 755 /opt/homebrew/opt/openssl@1.1/* - chmod -R 755 /opt/homebrew/opt/poppler/* - python3 --version - - pip3 install --user --upgrade pip dropbox conan==1.60 + - pip3 install --user --upgrade pip dropbox conan==1.61.0 - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE" - conan --version - qmake --version diff --git a/appveyor.yml b/appveyor.yml index 08601f482..05d5529c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -411,7 +411,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.60 + - python -m pip install conan==1.61.0 # 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" @@ -716,7 +716,7 @@ for: fi - sudo python3 -m pip install --upgrade pip - - pip3 install --user --upgrade pip dropbox conan==1.60 + - pip3 install --user --upgrade pip dropbox conan==1.61.0 - export PATH="$PATH:`python3 -m site --user-base`/bin" - echo $PATH - python3 --version @@ -849,7 +849,7 @@ for: - sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python - whereis python - sudo python3 -m pip install --upgrade pip - - pip3 install --user --upgrade pip dropbox conan==1.60 + - pip3 install --user --upgrade pip dropbox conan==1.61.0 - conan --version - clang --version - qmake --version