From f48a60d58cc7ddf89401c46cdceccfed1f8fa368 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 7 Aug 2023 07:12:37 +0000 Subject: [PATCH] feat(GODT-2762): bump version Go 1.20 Qt 6.4.3. --- .gitlab-ci.yml | 6 +++--- BUILDS.md | 4 ++-- utils/credits.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1eb2fe88..2dacf749 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ stages: - export GO111MODULE=on - export PATH="${GOPATH}/bin:${PATH}" - export MSYSTEM= - - export QT6DIR=/c/grrrQt/6.3.2/msvc2019_64 + - export QT6DIR=/c/grrrQt/6.4.3/msvc2019_64 - export PATH=$PATH:${QT6DIR}/bin - export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH" - $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove" @@ -93,7 +93,7 @@ stages: - export PATH="${GOROOT}/bin:$PATH" - export GOPATH=~/go1.20 - export PATH="${GOPATH}/bin:$PATH" - - export QT6DIR=/opt/Qt/6.3.2/macos + - export QT6DIR=/opt/Qt/6.4.3/macos - export PATH="${QT6DIR}/bin:$PATH" - uname -a cache: {} @@ -101,7 +101,7 @@ stages: - macos-m1-bridge .env-linux-build: - image: gitlab.protontech.ch:4567/go/bridge-internal:build-go1.20-qt6.3.2 + image: gitlab.protontech.ch:4567/go/bridge-internal:build-go1.20-qt6.4.3 variables: VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache cache: diff --git a/BUILDS.md b/BUILDS.md index 237694bd..261ecd69 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -10,7 +10,7 @@ * Windres (Windows) * libglvnd and libsecret development files (Linux) * pkg-config (Linux) -* cmake, ninja-build and Qt 6 are required to build the graphical user interface. On Linux, +* cmake, ninja-build and Qt 6.4.3 are required to build the graphical user interface. On Linux, the Mesa OpenGL development files are also needed. To enable the sending of crash reports using Sentry please set the @@ -19,7 +19,7 @@ Otherwise, the sending of crash reports will be disabled. ## Build In order to build Bridge app with Qt interface we are using -[Qt 6.3](https://doc.qt.io/qt-6/gettingstarted.html). +[Qt 6.4.3](https://doc.qt.io/qt-6/gettingstarted.html). Please note that qmake path must be in your `PATH` to ensure Qt to be found. Also, before you start build **on Windows**, please unset the `MSYSTEM` variable diff --git a/utils/credits.sh b/utils/credits.sh index 9ffe77d7..a0b4c24f 100755 --- a/utils/credits.sh +++ b/utils/credits.sh @@ -30,7 +30,7 @@ egrep $'^\t[^=>]*$' $LOCKFILE | sed -r 's/\t([^ ]*) v.*/\1/g' > $TEMPFILE1 egrep $'^\t.*=>.*v.*$' $LOCKFILE | sed -r 's/^.*=> ([^ ]*)( v.*)?/\1/g' >> $TEMPFILE1 cat $TEMPFILE1 | egrep -v 'therecipe/qt/internal|therecipe/env_.*_512|protontech' | sort | uniq > $TEMPFILE2 # Add non vendor credits -echo -e "\nQt 6.3.1 by Qt group\n" >> $TEMPFILE2 +echo -e "\nQt 6.4.3 by Qt group\n" >> $TEMPFILE2 # join lines sed -i -e ':a' -e 'N' -e '$!ba' -e 's|\n|;|g' $TEMPFILE2