diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index fc438a51..c098d823 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: 11.0 + MACOSX_DEPLOYMENT_TARGET: 12.0 jobs: build: @@ -35,7 +35,11 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' run: | git clone --depth=1 https://github.com/google/googletest.git - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_INSTALL_PREFIX=${GTest_ROOT} -DCMAKE_CXX_STANDARD=17 -S googletest -B gtest-build + cmake -S googletest -B gtest-build \ + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ + -DCMAKE_INSTALL_PREFIX=${GTest_ROOT} \ + -DCMAKE_CXX_STANDARD=17 cmake --build gtest-build --target install - name: Build OpenSSL @@ -58,9 +62,9 @@ jobs: cd - - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: 6.6.1 + version: 6.7.2 arch: clang_64 - name: Configure diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index b3505b25..cc4a88de 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -33,9 +33,9 @@ jobs: vcpkgGitCommitId: 1f619be01b436b796dab797dd1e1721c5676f8ac - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: - version: 6.7.1 + version: 6.7.2 arch: win64_msvc2019_64 - name: Setup MS Visual C++ dev env diff --git a/install/English.lproj/Localizable.strings b/install/English.lproj/Localizable.strings index 3a486517..5e8118a1 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_11" = "macOS version needs to be 11.0 or newer."; +"SU_12" = "macOS version needs to be 12.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 0f40b2e1..240eaaa8 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_11" = "verze macOS musí být 11.0 nebo novější."; +"SU_12" = "verze macOS musí být 12.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 844b8766..6123c4a3 100644 --- a/install/distribution.xml +++ b/install/distribution.xml @@ -17,9 +17,9 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I