From 8ecdad4396018a139524a123f1d6123ee52dffcf Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Mon, 30 Jun 2025 14:50:58 +0300 Subject: [PATCH] Increase version number WE2-1101, IB-8306 Signed-off-by: Raul Metsma --- .github/workflows/cmake-linux-ubuntu.yml | 2 +- .github/workflows/cmake-macos.yml | 10 +++---- .github/workflows/cmake-windows.yml | 30 +++++++++---------- CMakeLists.txt | 4 +-- install/English.lproj/Localizable.strings | 2 +- install/cs.lproj/Localizable.strings | 2 +- install/distribution.xml | 4 +-- install/et.lproj/Localizable.strings | 2 +- install/ru.lproj/Localizable.strings | 2 +- install/sk.lproj/Localizable.strings | 2 +- install/web-eid.wxs | 26 +++++++---------- src/app/CMakeLists.txt | 17 ++++------- src/app/main.cpp | 2 -- src/controller/utils/observer_ptr.hpp | 22 ++++++++++++++ src/mac/CMakeLists.txt | 2 +- src/mac/main.mm | 2 -- src/ui/CMakeLists.txt | 22 ++++++-------- src/ui/web-eid-resources.qrc | 35 ----------------------- 18 files changed, 75 insertions(+), 113 deletions(-) delete mode 100644 src/ui/web-eid-resources.qrc diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 5ed81c94..e1e8d413 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -17,7 +17,7 @@ jobs: container: ubuntu:${{matrix.container}} strategy: matrix: - container: ['22.04', '24.04', '24.10', '25.04'] + container: ['22.04', '24.04', '25.04'] arch: ['amd64', 'arm64'] steps: diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index 92ab003a..cc29f8ea 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -10,7 +10,7 @@ env: GTest_ROOT: ${{ github.workspace }}/gtest-binary QT_QPA_PLATFORM: offscreen CMAKE_BUILD_PARALLEL_LEVEL: 3 - MACOSX_DEPLOYMENT_TARGET: 12.0 + MACOSX_DEPLOYMENT_TARGET: 13.0 jobs: build: @@ -39,16 +39,16 @@ jobs: -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -DCMAKE_INSTALL_PREFIX=${GTest_ROOT} \ - -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD=20 cmake --build gtest-build --target install - name: Build OpenSSL if: steps.cache.outputs.cache-hit != 'true' run: | - git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.0 + git clone --depth=1 https://github.com/openssl/openssl.git -b openssl-3.5 cd openssl for ARCH in x86_64 arm64; do - ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-shared no-module no-tests enable-ec_nistp_64_gcc_128 + ./Configure darwin64-${ARCH} --prefix=${OPENSSL_ROOT_DIR} no-apps no-shared no-module no-tests enable-ec_nistp_64_gcc_128 MAKEFLAGS=-j1 make -s install_sw mv ${OPENSSL_ROOT_DIR}{,.${ARCH}} make distclean @@ -64,7 +64,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.7.3 + version: 6.9.1 arch: clang_64 - name: Configure diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index be078d81..28027a67 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -9,15 +9,10 @@ env: jobs: build: - runs-on: ${{ matrix.image }} + runs-on: windows-2022 strategy: matrix: - vcver: [142, 143] - include: - - vcver: 142 - image: windows-2019 - - vcver: 143 - image: windows-2022 + arch: [x64, arm64] steps: - name: Checkout code @@ -29,26 +24,26 @@ jobs: uses: lukka/run-vcpkg@v7 with: vcpkgArguments: gtest openssl - vcpkgTriplet: x64-windows - vcpkgGitCommitId: 1f619be01b436b796dab797dd1e1721c5676f8ac + vcpkgTriplet: ${{matrix.arch}}-windows + vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.7.3 - arch: win64_msvc2019_64 + version: 6.9.1 + arch: ${{ matrix.arch == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }} - name: Setup MS Visual C++ dev env uses: ilammy/msvc-dev-cmd@v1 with: - arch: x64 + arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || 'amd64' }} - name: Install WiX run: | - dotnet tool install --global wix --version 5.0.2 - wix extension -g add WixToolset.UI.wixext/5.0.2 - wix extension -g add WixToolset.Util.wixext/5.0.2 - wix extension -g add WixToolset.BootstrapperApplications.wixext/5.0.2 + dotnet tool install --global wix --version 6.0.1 + wix extension -g add WixToolset.UI.wixext/6.0.1 + wix extension -g add WixToolset.Util.wixext/6.0.1 + wix extension -g add WixToolset.BootstrapperApplications.wixext/6.0.1 - name: Configure run: | @@ -63,12 +58,13 @@ jobs: cmake --build build --config ${env:BUILD_TYPE} --target bundle - name: Test + if: ${{ matrix.arch == 'x64' }} run: ctest -V -C ${env:BUILD_TYPE} --test-dir build - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: web-eid-app-windows-build-VC${{matrix.vcver}}-${{github.run_number}} + name: web-eid-app-windows-build-${{matrix.arch}}-${{github.run_number}} path: | build/src/app/*.msi build/src/app/*.exe diff --git a/CMakeLists.txt b/CMakeLists.txt index f8bbbe5c..8f5973a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ elseif($ENV{CI_PIPELINE_IID}) else() set(BUILD_NUMBER 0) endif() -project(web-eid VERSION 2.7.0.${BUILD_NUMBER}) +project(web-eid VERSION 2.8.0.${BUILD_NUMBER}) set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK}) @@ -33,8 +33,6 @@ set(CROSSSIGNCERT "" CACHE STRING "Common name of certificate to used cross sign set(SAFARI_PROVISIONPROFILE "" CACHE STRING "Provision profile to include in application (macOS)") find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network Test LinguistTools SvgWidgets) -get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION) -get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY) add_subdirectory(lib/libelectronic-id) diff --git a/install/English.lproj/Localizable.strings b/install/English.lproj/Localizable.strings index 5e8118a1..3cd0ed5e 100644 --- a/install/English.lproj/Localizable.strings +++ b/install/English.lproj/Localizable.strings @@ -1,6 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Error"; -"SU_12" = "macOS version needs to be 12.0 or newer."; +"SU_13" = "macOS version needs to be 13.0 or newer."; "SU_BASE" = "Base components"; "SU_FIREFOX" = "Firefox authentication and signing support"; "SU_CHROME" = "Chrome authentication and signing support"; diff --git a/install/cs.lproj/Localizable.strings b/install/cs.lproj/Localizable.strings index 240eaaa8..5544989a 100644 --- a/install/cs.lproj/Localizable.strings +++ b/install/cs.lproj/Localizable.strings @@ -1,6 +1,6 @@ "SU_TITLE" = "Web eID Software"; "SU_ERROR" = "Chyba"; -"SU_12" = "verze macOS musí být 12.0 nebo novější."; +"SU_13" = "verze macOS musí být 13.0 nebo novější."; "SU_BASE" = "Základní komponenty"; "SU_FIREFOX" = "Podpora ověřování a podepisování Firefoxu"; "SU_CHROME" = "Podpora ověřování a podepisování Chrome"; diff --git a/install/distribution.xml b/install/distribution.xml index 6123c4a3..f23c4d28 100644 --- a/install/distribution.xml +++ b/install/distribution.xml @@ -17,9 +17,9 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I