Skip to content

Commit

Permalink
Set macOS minimum target 12.0
Browse files Browse the repository at this point in the history
WE2-1004

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Jul 19, 2024
1 parent 57b96b6 commit acab56c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 14 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/cmake-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/English.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion install/cs.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -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";
4 changes: 2 additions & 2 deletions install/distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I
<script>
<![CDATA[
function pm_install_check() {
if(system.compareVersions(system.version.ProductVersion, '10.16.0') < 0) {
if(system.compareVersions(system.version.ProductVersion, '12.0') < 0) {
my.result.title = system.localizedString('SU_ERROR');
my.result.message = system.localizedString('SU_11');
my.result.message = system.localizedString('SU_12');
my.result.type = 'Fatal';
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion install/et.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"SU_TITLE" = "Web eID tarkvara";
"SU_ERROR" = "Viga";
"SU_11" = "macOS'i versioon peab olema 11.0 või uuem.";
"SU_12" = "macOS'i versioon peab olema 12.0 või uuem.";
"SU_BASE" = "Baaskomponendid";
"SU_FIREFOX" = "Firefoxi autentimise ja allkirjastamise tugi";
"SU_CHROME" = "Chrome'i autentimise ja allkirjastamise tugi";
2 changes: 1 addition & 1 deletion install/ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -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";
"SU_CHROME" = "Поддержка аутентиф. и подпис. в Chrome";
2 changes: 1 addition & 1 deletion install/sk.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"SU_TITLE" = "Web eID Software";
"SU_ERROR" = "Chyba";
"SU_11" = "verzia macOS musí byť 11.0 alebo novšia.";
"SU_12" = "verzia macOS musí byť 12.0 alebo novšia.";
"SU_BASE" = "Základné komponenty";
"SU_FIREFOX" = "Podpora overovania a podpisovania Firefoxu";
"SU_CHROME" = "Podpora overovania a podpisovania Chrome";
2 changes: 1 addition & 1 deletion src/mac/js
Submodule js updated 2 files
+255 −339 package-lock.json
+1 −1 package.json

0 comments on commit acab56c

Please sign in to comment.