Cleanup

trikset · Oct 24, 2024 · f8fd959 · f8fd959
1 parent 6564b98
commit f8fd959
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 80 deletions.
diff --git a/.github/workflows/linux_build.yml → .github/workflows/common_build.yml b/.github/workflows/linux_build.yml → .github/workflows/common_build.yml
@@ -44,6 +44,39 @@ jobs:
       build: false
       build_installer: false
 
+  build-macos-release-tests:
+    needs: lint
+    uses: ./.github/workflows/setup_environment.yml
+    with:
+      os: macos-12
+      build: true
+      build_installer: false
+      qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=warn_off"
+      trik_python3_version_minor: "11"
+
+  build-macos-debug-tests:
+    needs: lint
+    uses: ./.github/workflows/setup_environment.yml
+    with:
+      os: macos-12
+      build: true
+      build_installer: false
+      config: debug
+      qmake_extra: "CONFIG+=warn_off CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
+      trik_python3_version_minor: "11"
+
+  build-macos-installer:
+    needs: [build-macos-debug-tests, build-macos-release-tests]
+    uses: ./.github/workflows/setup_environment.yml
+    with:
+      os: macos-12
+      build: true
+      build_installer: true
+      qmake_extra: " CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
+      trik_python3_version_minor: "11"
+      tests: true
+    secrets: inherit
+
   build-ubuntu-release-tests:
     needs: lint
     uses: ./.github/workflows/setup_environment.yml

diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
diff --git a/buildScripts/github/install_Linux.sh b/buildScripts/github/install_Linux.sh
@@ -34,5 +34,5 @@ fi
 if [ "$BUILD_INSTALLER" = "true" ]; then
   "$TRIK_PYTHON" -m pip install -U pip
   "$TRIK_PYTHON" -m pip install aqtinstall
-  "$TRIK_PYTHON" -m aqt install-tool -O /Qt linux desktop tools_ifw
+  sudo "$TRIK_PYTHON" -m aqt install-tool -O /Qt linux desktop tools_ifw
 fi