aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-02-18 13:02:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-22 12:43:18 +0000
commit88c07c72e24b50cd5ddc774f48134d85de256f96 (patch)
treefc97c9e26652af3da5b7176d1edc12b41883eb33
parent394b2cb94efe3c51d1cde855efbc5dd48ef94dbf (diff)
New images with accessibility for squish for macOS 10.15 and 11.0
Task-number: QTQAINFRA-3559 Change-Id: I9a9d4c4f01f883c83adbd097d8045012e198c4fe Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c8a55fece54870c8c6ad9571f2d29402d56c556e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/macos-developer-build-tests.yaml4
-rw-r--r--coin/platform_configs/macos.yaml8
-rw-r--r--coin/pre-provisioning/qtci-macos-10.15-x86_64/README7
-rw-r--r--coin/pre-provisioning/qtci-macos-11.0-x86_64/README8
4 files changed, 21 insertions, 6 deletions
diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml
index 458462d5..207f7ec7 100644
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -8,13 +8,13 @@ Configurations:
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-10.15-x86_64-developer-build-tests'
- Template: 'qtci-macos-10.15-x86_64-100'
+ Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-11-x86_64-developer-build-tests'
- Template: 'qtci-macos-11.0-x86_64-100'
+ Template: 'qtci-macos-11.0-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index fcbd14bf..bc76aff8 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -3,7 +3,7 @@ Configurations:
# Build with latest Xcode
-
Id: 'macos-latest-xcode-x86_64-packaging-build'
- Template: 'qtci-macos-11.0-x86_64-100'
+ Template: 'qtci-macos-11.0-x86_64-102'
Compiler: 'Clang'
Features: ['Packaging', 'Sccache', 'DoNotRunTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
@@ -21,13 +21,13 @@ Configurations:
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-
Id: 'macos-10.15-x86_64-tests'
- Template: 'qtci-macos-10.15-x86_64-100'
+ Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-
Id: 'macos-11-x86_64-tests'
- Template: 'qtci-macos-11.0-x86_64-100'
+ Template: 'qtci-macos-11.0-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
@@ -36,7 +36,7 @@ Configurations:
# See macos-developer-build-tests.yaml for the tests
-
Id: 'macos-latest-xcode-x86_64-developer-build'
- Template: 'qtci-macos-11.0-x86_64-100'
+ Template: 'qtci-macos-11.0-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests']
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
diff --git a/coin/pre-provisioning/qtci-macos-10.15-x86_64/README b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README
new file mode 100644
index 00000000..82525162
--- /dev/null
+++ b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README
@@ -0,0 +1,7 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","com.froglogic.squish.ide.product",0,1,1,"UNSEEN",0,1612871478)
+
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","/Users/qt/bootstrap-agent",1,1,1,"UNSEEN",0,1612871478);
+EOF
+
diff --git a/coin/pre-provisioning/qtci-macos-11.0-x86_64/README b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README
new file mode 100644
index 00000000..6713914d
--- /dev/null
+++ b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README
@@ -0,0 +1,8 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','com.froglogic.squish.ide.product',0,2,4,1,0,0,1612867994);
+
+{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','/Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/jre/bin/java',1,2,4,1,0,0,1612867994);
+
+EOF