Accessing macOS build worker via VNC.

Patch Qbs. Fix from version 2.1.2.
Add python binary for xcode-select.
2024-09-16 13:54:41 +02:00 · 2023-09-14 19:57:07 +03:00 · 2023-09-14 18:48:37 +03:00 · 2023-09-14 15:34:18 +03:00 · 2023-09-14 15:16:11 +03:00 · 2023-09-14 14:57:11 +03:00
2 changed files with 85 additions and 58 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -205,13 +205,17 @@ macos_task_template: &MACOS_TASK_TEMPLATE
    - security default-keychain -s build.keychain
    # Unlock the keychain
    - security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    # Check if System.keychain is not cluttered
+    # good: 60K
+    # bad: 25MB
+    - du -h /Library/Keychains/System.keychain
    # Add certificates to keychain and allow codesign to access them
    # 1) Apple Worldwide Developer Relations Certification Authority
    - curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
-    - security import $HOME/AppleWWDRCAG3.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/AppleWWDRCAG3.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 2) Developer Authentication Certification Authority
    - curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
-    - security import $HOME/DeveloperIDG2CA.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 3) Developer ID
    - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
    # Delete the files, we no longer need them
@ -239,10 +243,18 @@ macos_task_template: &MACOS_TASK_TEMPLATE
    - qmake --version
    - which qmake
    - qbs --version
+    # Patch Qbs. Remove after Qbs 2.1.2+.
+    - curl https://gist.githubusercontent.com/dismine/43a20f66f563232e54e02f2e85732e7a/raw/e80a0c827348da3e99310ba4a648c1860bb3a8a6/BundleModule.qbs --output $HOME/BundleModule.qbs --silent
+    - cp -f $HOME/BundleModule.qbs $(brew --prefix qbs)/share/qbs/modules/bundle/BundleModule.qbs
+    - rm $HOME/BundleModule.qbs
  build_script:
    - echo $PATH
    - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
    - echo $PATH
+    - whereis python3
+    - sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
+    - sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
+    - whereis python
    - pwd
    - conan profile new valentina
    - conan profile update settings.build_type=Release valentina
--- a/appveyor.yml
+++ b/appveyor.yml
@ -41,6 +41,58 @@ environment:
    secure: RUhnEHqaR8KhalOMWwZZOoO342Ja50QV4KpEWdm9g3pG+jG7i6aJqUmeKF1l5VN6dzksk1u+yN6pOLnU8oGcaVQ6v+1dpKK1oZvF0tyHhNE=

  matrix:
+    - job_name: MacOS_12_Qt_6_4 (multibundle)
+      APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
+      COMPILER: clang
+      QT: Qt/6.4/macos
+      QT_VERSION: Qt6_4
+      BUILD_SYSTEM: "qbs"
+      ARCH: x64
+      XCODE_VERSION: 13.4.1
+      PLATFORM: "macOS_11+"
+      MACOS_DEPLOYMENT_TARGET: 11.0
+      MULTI_BUNDLE: true
+      DEPLOY: true
+
+    - job_name: MacOS_12_Qt_6_4 (singlebundle)
+      APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
+      COMPILER: clang
+      QT: Qt/6.4/macos
+      QT_VERSION: Qt6_4
+      BUILD_SYSTEM: "qbs"
+      ARCH: x64
+      XCODE_VERSION: 13.4.1
+      PLATFORM: "macOS_11+"
+      MACOS_DEPLOYMENT_TARGET: 11.0
+      MULTI_BUNDLE: false
+      DEPLOY: true
+
+    - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
+      APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
+      COMPILER: clang
+      QT: Qt/5.15/clang_64
+      QT_VERSION: Qt5_15
+      BUILD_SYSTEM: "qbs"
+      ARCH: x64
+      XCODE_VERSION: 12.3
+      PLATFORM: "macOS_10.13+"
+      MACOS_DEPLOYMENT_TARGET: 10.13
+      MULTI_BUNDLE: true
+      DEPLOY: true
+
+    - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
+      APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
+      COMPILER: clang
+      QT: Qt/5.15/clang_64
+      QT_VERSION: Qt5_15
+      BUILD_SYSTEM: "qbs"
+      ARCH: x64
+      XCODE_VERSION: 12.3
+      PLATFORM: "macOS_10.13+"
+      MACOS_DEPLOYMENT_TARGET: 10.13
+      MULTI_BUNDLE: false
+      DEPLOY: true
+
    - job_name: Windows_Qt_6_5_(GCC_x64)
      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
      COMPILER: mingw
@ -94,58 +146,6 @@ environment:
      PLATFORM: "WindowsXP+"
      DEPLOY: true

-    - job_name: MacOS_12_Qt_6_4 (multibundle)
-      APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
-      COMPILER: clang
-      QT: Qt/6.4/macos
-      QT_VERSION: Qt6_4
-      BUILD_SYSTEM: "qbs"
-      ARCH: x64
-      XCODE_VERSION: 13.4.1
-      PLATFORM: "macOS_11+"
-      MACOS_DEPLOYMENT_TARGET: 11.0
-      MULTI_BUNDLE: true
-      DEPLOY: true
-
-    - job_name: MacOS_12_Qt_6_4 (singlebundle)
-      APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
-      COMPILER: clang
-      QT: Qt/6.4/macos
-      QT_VERSION: Qt6_4
-      BUILD_SYSTEM: "qbs"
-      ARCH: x64
-      XCODE_VERSION: 13.4.1
-      PLATFORM: "macOS_11+"
-      MACOS_DEPLOYMENT_TARGET: 11.0
-      MULTI_BUNDLE: false
-      DEPLOY: true
-
-    - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
-      APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
-      COMPILER: clang
-      QT: Qt/5.15/clang_64
-      QT_VERSION: Qt5_15
-      BUILD_SYSTEM: "qbs"
-      ARCH: x64
-      XCODE_VERSION: 12.3
-      PLATFORM: "macOS_10.13+"
-      MACOS_DEPLOYMENT_TARGET: 10.13
-      MULTI_BUNDLE: true
-      DEPLOY: true
-
-    - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
-      APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
-      COMPILER: clang
-      QT: Qt/5.15/clang_64
-      QT_VERSION: Qt5_15
-      BUILD_SYSTEM: "qbs"
-      ARCH: x64
-      XCODE_VERSION: 12.3
-      PLATFORM: "macOS_10.13+"
-      MACOS_DEPLOYMENT_TARGET: 10.13
-      MULTI_BUNDLE: false
-      DEPLOY: true
-
    - job_name: Windows_Qt_6_4_(GCC_x64)
      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
      COMPILER: mingw
@ -612,6 +612,7 @@ for:
    - /Users/appveyor/cache_dir

  init:
+    - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-vnc.sh' | bash -e -
    - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
    - sudo xcode-select -p
    - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
@ -627,13 +628,17 @@ for:
    - security default-keychain -s build.keychain
    # Unlock the keychain
    - security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    # Check if System.keychain is not cluttered
+    # good: 60K
+    # bad: 25MB
+    - du -h /Library/Keychains/System.keychain
    # Add certificates to keychain and allow codesign to access them
    # 1) Apple Worldwide Developer Relations Certification Authority
    - curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
-    - security import $HOME/AppleWWDRCAG3.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/AppleWWDRCAG3.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 2) Developer Authentication Certification Authority
    - curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
-    - security import $HOME/DeveloperIDG2CA.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 3) Developer ID
    - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
    # Delete the files, we no longer need them
@ -652,6 +657,9 @@ for:
    - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
    - echo $PATH
    - python3 --version
+    - whereis python3
+    - sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
+    - whereis python
    - |-

      ###############################################################
@ -795,13 +803,17 @@ for:
    - security default-keychain -s build.keychain
    # Unlock the keychain
    - security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+    # Check if System.keychain is not cluttered
+    # good: 60K
+    # bad: 25MB
+    - du -h /Library/Keychains/System.keychain
    # Add certificates to keychain and allow codesign to access them
    # 1) Apple Worldwide Developer Relations Certification Authority
    - curl https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer --output $HOME/AppleWWDRCAG3.cer --silent
-    - security import $HOME/AppleWWDRCAG3.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/AppleWWDRCAG3.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 2) Developer Authentication Certification Authority
    - curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
-    - security import $HOME/DeveloperIDG2CA.cer -k build.keychain -T /usr/bin/codesign
+    - sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
    # 3) Developer ID
    - security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
    # Delete the files, we no longer need them
@ -820,6 +832,9 @@ for:
    - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
    - echo $PATH
    - python3 --version
+    - whereis python3
+    - sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
+    - whereis python
    - sudo python3 -m pip install --upgrade pip
    - pip3 install --user --upgrade pip dropbox conan==1.60
    - conan --version
Author	SHA1	Message	Date
Roman Telezhynskyi	b462286a23	Accessing macOS build worker via VNC.	2023-09-14 19:57:07 +03:00
Roman Telezhynskyi	390e30f664	Patch Qbs. Fix from version 2.1.2.	2023-09-14 18:48:37 +03:00
Roman Telezhynskyi	f34b8afda4	Add python binary for xcode-select.	2023-09-14 15:34:18 +03:00
Roman Telezhynskyi	c0dcb9303a	Move the symlink to build_script stage.	2023-09-14 15:16:11 +03:00
Roman Telezhynskyi	8cf84c9226	ln: /usr/bin/python: Read-only file system	2023-09-14 14:57:11 +03:00
Roman Telezhynskyi	06a40757d6	Check if System.keychain is not cluttered	2023-09-14 14:49:18 +03:00
Roman Telezhynskyi	ac7732f7af	Switch to /usr/bin.	2023-09-14 14:48:58 +03:00
Roman Telezhynskyi	dc28faab7c	ln: /usr/local/bin/python: Permission denied	2023-09-14 13:36:16 +03:00
Roman Telezhynskyi	4d0c6cfb82	Installing to System.keychain requires root rights.	2023-09-14 13:28:57 +03:00
Roman Telezhynskyi	fed375993b	Move macos builds on top.	2023-09-14 13:14:43 +03:00
Roman Telezhynskyi	1947a0d8a7	Install certificates to System.keychain instead.	2023-09-14 13:13:23 +03:00
Roman Telezhynskyi	784c3ff3e7	Link Python to Python3.	2023-09-14 13:12:46 +03:00