From 6bf4c820a62fef08dc2a4e82dcc8f4066022d526 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Mar 2024 12:10:16 +0200 Subject: [PATCH] Fetch tags to get correct project version. --- .cirrus.yml | 6 ++++++ appveyor.yml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 0b5c82a7b..cfc0f47b1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,6 +20,7 @@ regular_task_template: ®ULER_TASK_TEMPLATE linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE install_script: - bash -c "$PACKAGE_MANAGER_INSTALL -y qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 libxerces-c-dev poppler-utils libgl1-mesa-dev" + - git fetch --tags build_script: - uname -a - mkdir -pm 0700 $XDG_RUNTIME_DIR @@ -45,6 +46,7 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE install_script: - bash -c "$PACKAGE_MANAGER_INSTALL -y qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 libxerces-c-dev poppler-utils libgl1-mesa-dev" + - git fetch --tags build_script: - uname -a - mkdir -pm 0700 $XDG_RUNTIME_DIR @@ -79,6 +81,7 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE install_script: - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils" + - git fetch --tags build_script: - uname -a - echo $PATH @@ -100,6 +103,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE install_script: - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils" + - git fetch --tags build_script: - uname -a - mkdir -pm 0700 $XDG_RUNTIME_DIR @@ -129,6 +133,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE folder: "~/.conan/data" install_script: - bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential libgl1-mesa-dev libicu-dev python3-pip cmake" + - git fetch --tags - python3 --version - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests build_script: @@ -317,6 +322,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE pip_cache: folder: ${PIP_CACHE_DIR} install_script: + - git fetch --tags - clang --version - find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - sudo xcode-select -p diff --git a/appveyor.yml b/appveyor.yml index 3a5733605..518d216c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -314,6 +314,7 @@ for: - set QTDIR=C:\%QT% - set QT_PLUGIN_PATH=%QTDIR%\plugins - set PATH=%QTDIR%\bin;%QTDIR%\include;C:\ProgramData\chocolatey\bin;C:\Qt\Tools\QtCreator\bin;C:\Tools\PsTools;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Git LFS;C:\Tools\GitVersion;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\CMake\bin;%PYTHON%;%PYTHON%\Scripts;C:\Program Files (x86)\Inno Setup 6 + - git fetch --tags # Set VC variables for the platform - ps: | & choco install qbs -y --version=2.2.2 @@ -557,6 +558,7 @@ for: - $HOME/brew_cache_dir init: + - git fetch --tags - find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - sudo xcode-select -p - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app @@ -758,6 +760,7 @@ for: - $HOME/brew_cache_dir init: + - git fetch --tags - find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - sudo xcode-select -p - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app