diff --git a/.github/workflows/linux_build.yml b/.github/workflows/common_build.yml similarity index 73% rename from .github/workflows/linux_build.yml rename to .github/workflows/common_build.yml index e4d438a80d..e968729a78 100644 --- a/.github/workflows/linux_build.yml +++ b/.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 deleted file mode 100644 index 3df76ee7bd..0000000000 --- a/.github/workflows/macos_build.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: macOS CI - -on: - push: - branches-ignore: - - 'dependabot**' - tags: - - '*' - paths-ignore: - - '**/lsan.supp' - - 'buildScripts/travis/*' - - 'buildScripts/azure/*' - - 'buildScripts/docker/*' - - 'azure-pipelines.yml' - - '.cirrus.yml' - - '.travis.yml' - - '.mergify.yml' - - 'Brewfile' - - '**/*.html' - - '**/*.txt' - - '**/*.md' - - 'installer/packages/**/meta/prebuild-mac.sh' - - 'installer/packages/**/meta/prebuild-linux-gnu.sh' - - '**/*.dockerfile' - - '**/*.Dockerfile' - - '**/Dockerfile' - - '**/Dockerfile.*' - - 'plugins/robots/checker/scripts/build-checker-installer.sh' - - '.github/workflows/centos.yml' - pull_request: - branches-ignore: - - 'dependabot**' - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - lint: - uses: ./.github/workflows/setup_environment.yml - with: - os: ubuntu-latest - lint: true - 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 diff --git a/buildScripts/github/install_Linux.sh b/buildScripts/github/install_Linux.sh index d83b684b71..a0e60dcd9f 100755 --- 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