From 47b94512ef56b41415e76b8839629d778809de42 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Fri, 7 Nov 2025 14:46:43 +0200 Subject: [PATCH] Update version number WE2-1141 Signed-off-by: Raul Metsma --- .github/workflows/cmake-linux-codeql.yml | 11 ++++---- .github/workflows/cmake-linux-coverity.yml | 1 + .github/workflows/cmake-linux-fedora.yml | 5 ++-- .github/workflows/cmake-linux-ubuntu.yml | 3 +- .github/workflows/cmake-macos.yml | 5 ++-- .github/workflows/cmake-windows.yml | 3 +- CMakeLists.txt | 5 +++- README.md | 32 ++++++++++------------ build.ps1 | 8 ++++-- src/ui/CMakeLists.txt | 6 +++- src/ui/translations/cs.ts | 11 ++++++++ src/ui/translations/de.ts | 11 ++++++++ src/ui/translations/en.ts | 11 ++++++++ src/ui/translations/et.ts | 11 ++++++++ src/ui/translations/fi.ts | 11 ++++++++ src/ui/translations/fr.ts | 11 ++++++++ src/ui/translations/hr.ts | 11 ++++++++ src/ui/translations/nl.ts | 11 ++++++++ src/ui/translations/ru.ts | 11 ++++++++ src/ui/translations/sk.ts | 11 ++++++++ 20 files changed, 155 insertions(+), 34 deletions(-) diff --git a/.github/workflows/cmake-linux-codeql.yml b/.github/workflows/cmake-linux-codeql.yml index dcd5ae23..db5f32f4 100644 --- a/.github/workflows/cmake-linux-codeql.yml +++ b/.github/workflows/cmake-linux-codeql.yml @@ -19,26 +19,27 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + persist-credentials: false - - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/init@v4 with: languages: cpp queries: +security-and-quality - - uses: github/codeql-action/autobuild@v3 + - uses: github/codeql-action/autobuild@v4 - - uses: github/codeql-action/analyze@v3 + - uses: github/codeql-action/analyze@v4 with: upload: False output: sarif-results - - uses: advanced-security/filter-sarif@develop + - uses: advanced-security/filter-sarif@v1 with: patterns: | -**/*autogen*/** input: sarif-results/cpp.sarif output: sarif-results/cpp.sarif - - uses: github/codeql-action/upload-sarif@v3 + - uses: github/codeql-action/upload-sarif@v4 with: sarif_file: sarif-results/cpp.sarif diff --git a/.github/workflows/cmake-linux-coverity.yml b/.github/workflows/cmake-linux-coverity.yml index e4a2ddfb..9345d4da 100644 --- a/.github/workflows/cmake-linux-coverity.yml +++ b/.github/workflows/cmake-linux-coverity.yml @@ -26,6 +26,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + persist-credentials: false - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S . diff --git a/.github/workflows/cmake-linux-fedora.yml b/.github/workflows/cmake-linux-fedora.yml index b9dcf253..c056305c 100644 --- a/.github/workflows/cmake-linux-fedora.yml +++ b/.github/workflows/cmake-linux-fedora.yml @@ -14,7 +14,7 @@ jobs: container: fedora:${{ matrix.container }} strategy: matrix: - container: [41, 42, 43] + container: [42, 43] steps: - name: Install Deps @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + persist-credentials: false - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -B build -S . @@ -30,7 +31,7 @@ jobs: - name: Build run: cmake --build build --config $BUILD_TYPE --target package - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: name: web-eid-app-fedora-build-fedora${{matrix.container}}-${{github.run_number}} path: build/*rpm diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 062e9492..edd63b03 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -27,6 +27,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + persist-credentials: false - name: Configure CMake run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S . @@ -40,7 +41,7 @@ jobs: - name: Test package run: lintian build/*.deb - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: name: web-eid-app-ubuntu-build-ubuntu${{matrix.container}}-${{ matrix.arch }}-${{github.run_number}} path: build/*.*deb diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index b08e0ba4..69d5ca0c 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -21,6 +21,7 @@ jobs: uses: actions/checkout@v5 with: submodules: recursive + persist-credentials: false - name: Cache uses: actions/cache@v4 @@ -64,7 +65,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.9.3 + version: 6.10.0 arch: clang_64 - name: Configure @@ -80,7 +81,7 @@ jobs: # run: ctest -V -C ${BUILD_TYPE} --test-dir ${BUILD_DIR} - name: Upload artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: web-eid-app-macos-build-${{github.run_number}} path: | diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 95b6b63e..02579aae 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@v5 with: submodules: recursive + persist-credentials: false - name: Cache vcpkg uses: actions/cache@v4 @@ -74,7 +75,7 @@ jobs: run: ctest -V -C ${env:BUILD_TYPE} --test-dir build - name: Upload artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: web-eid-app-windows-build-${{matrix.arch}}-${{github.run_number}} path: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f5973a5..303ae180 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,10 @@ elseif($ENV{CI_PIPELINE_IID}) else() set(BUILD_NUMBER 0) endif() -project(web-eid VERSION 2.8.0.${BUILD_NUMBER}) +project(web-eid VERSION 2.9.0.${BUILD_NUMBER} + DESCRIPTION "Web eID browser extension helper application" + HOMEPAGE_URL https://github.com/web-eid/web-eid-app +) set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK}) diff --git a/README.md b/README.md index 8c795ab2..c50f15fa 100644 --- a/README.md +++ b/README.md @@ -266,13 +266,13 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker ### Windows -- Download Visual Studio 2019 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_ +- Download Visual Studio 2022 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_ - Install WIX toolset - dotnet tool install --global wix --version 5.0.0 - wix extension -g add WixToolset.UI.wixext/5.0.0 - wix extension -g add WixToolset.Util.wixext/5.0.0 - wix extension -g add WixToolset.Bal.wixext/5.0.0 + dotnet tool install --global wix --version 6.0.2 + wix extension -g add WixToolset.UI.wixext/6.0.2 + wix extension -g add WixToolset.Util.wixext/6.0.2 + wix extension -g add WixToolset.Bal.wixext/6.0.2 - Download and install Git for Windows from https://git-scm.com/download/win - Download and install CMake from https://cmake.org/download/ @@ -283,12 +283,8 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker .\bootstrap-vcpkg.bat .\vcpkg integrate install -- Install _Google Test_ and _OpenSSL_ with _vcpkg_: - - .\vcpkg install --recurse --triplet x64-windows --clean-after-build gtest openssl - - Install _Qt_ with the official [_Qt Online Installer_](https://www.qt.io/download-qt-installer), - choose _Custom installation > Qt 6.6.3 > MSVC 2019 64-bit_. + choose _Custom installation > Qt 6.10.0 > MSVC 2022 64-bit_. ### macOS @@ -303,7 +299,7 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker - Create symlink to _OpenSSL_ location and setup environment variables required by _CMake_: - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 + export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3.0 export QT_DIR=/usr/local/opt/qt6/lib/cmake/Qt6 ## Building and testing @@ -320,7 +316,7 @@ Use _Powershell_ to run the following commands to build the project. - Set the _Qt_ installation directory variable: - $QT_ROOT = "C:\Qt\6.2.4\msvc2019_64" + $QT_ROOT = "C:\Qt\6.10.0\msvc2022_64" - Set the _vcpkg_ installation directory variable: @@ -332,11 +328,11 @@ Use _Powershell_ to run the following commands to build the project. - Run _CMake_: -Optionally, WIX Toolset v3 is required for the installer, and the WIX environment variable should be set for the installed target. - - cmake "-DCMAKE_PREFIX_PATH=${QT_ROOT}" ` + cmake -A x64 -B build -S . + "-DCMAKE_PREFIX_PATH=${QT_ROOT}" ` "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" ` - "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" -A x64 -B build -S . + "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" ` + "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github" - Run the build and installer build: @@ -353,9 +349,9 @@ Optionally, WIX Toolset v3 is required for the installer, and the WIX environmen ## Adding and updating translations -You can use the free [Qt Linguist application](https://doc.qt.io/qt-5/qtlinguist-index.html) +You can use the free [Qt Linguist application](https://doc.qt.io/qt-6/qtlinguist-index.html) to add and edit translations. Run the following command to update Qt Linguist TS files: - lupdate src/ -ts ./src/ui/translations/*.ts + cmake --build build --config ${BUILD_TYPE} --target update_translations diff --git a/build.ps1 b/build.ps1 index 4e534637..66a20f49 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,8 +1,10 @@ param( [string]$cmake = "C:\Program Files\CMake\bin\cmake.exe", [string]$vcpkgroot = "C:\vcpkg", - [string]$qtdir = "C:\Qt\6.5.2\msvc2019_64" + [string]$qtdir = "C:\Qt\6.10.0\msvc2022_64", + [string]$buildtype = "RelWithDebInfo", + [string]$arch = "x64" ) -& $cmake -A x64 "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DQt6_DIR=$qtdir" -S . -B build -& $cmake --build build +& $cmake -S . -B build\windows -A $arch -DCMAKE_BUILD_TYPE=$buildtype "-DCMAKE_PREFIX_PATH=$qtdir" "-DCMAKE_TOOLCHAIN_FILE=$vcpkgroot\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_MANIFEST_DIR=lib/libelectronic-id/.github" +& $cmake --build build\windows --config $buildtype diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 7df12a6e..1870a02d 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -16,7 +16,11 @@ qt_add_resources(ui resources BASE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX / FILES ${FONTS} ) file(GLOB TRANSLATIONS translations/*.ts) -qt_add_translations(ui TS_FILES ${TRANSLATIONS} RESOURCE_PREFIX /translations) +qt_add_translations(ui + TS_FILES ${TRANSLATIONS} + RESOURCE_PREFIX /translations + LUPDATE_OPTIONS -locations none +) set_target_properties(ui PROPERTIES AUTORCC ON AUTOUIC ON diff --git a/src/ui/translations/cs.ts b/src/ui/translations/cs.ts index aba348bd..a792748e 100644 --- a/src/ui/translations/cs.ts +++ b/src/ui/translations/cs.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/de.ts b/src/ui/translations/de.ts index 594f1cdf..34f50dd2 100644 --- a/src/ui/translations/de.ts +++ b/src/ui/translations/de.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/en.ts b/src/ui/translations/en.ts index 2a9a35c2..899f3838 100644 --- a/src/ui/translations/en.ts +++ b/src/ui/translations/en.ts @@ -1,6 +1,17 @@ + + Application + + &File + &File + + + &About + &About + + CertificateButton diff --git a/src/ui/translations/et.ts b/src/ui/translations/et.ts index 6c7e13ee..9f816f59 100644 --- a/src/ui/translations/et.ts +++ b/src/ui/translations/et.ts @@ -1,6 +1,17 @@ + + Application + + &File + &Fail + + + &About + + + CertificateButton diff --git a/src/ui/translations/fi.ts b/src/ui/translations/fi.ts index 394b29cc..8e76e203 100644 --- a/src/ui/translations/fi.ts +++ b/src/ui/translations/fi.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/fr.ts b/src/ui/translations/fr.ts index e7d5da57..fd326d96 100644 --- a/src/ui/translations/fr.ts +++ b/src/ui/translations/fr.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/hr.ts b/src/ui/translations/hr.ts index 4135ba33..d21d019c 100644 --- a/src/ui/translations/hr.ts +++ b/src/ui/translations/hr.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/nl.ts b/src/ui/translations/nl.ts index 8599fdca..18a89a3c 100644 --- a/src/ui/translations/nl.ts +++ b/src/ui/translations/nl.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton diff --git a/src/ui/translations/ru.ts b/src/ui/translations/ru.ts index cdab949e..87e52566 100644 --- a/src/ui/translations/ru.ts +++ b/src/ui/translations/ru.ts @@ -1,6 +1,17 @@ + + Application + + &File + &Файл + + + &About + + + CertificateButton diff --git a/src/ui/translations/sk.ts b/src/ui/translations/sk.ts index e0a75986..759935fd 100644 --- a/src/ui/translations/sk.ts +++ b/src/ui/translations/sk.ts @@ -1,6 +1,17 @@ + + Application + + &File + + + + &About + + + CertificateButton