From abd94af493f3c77646042968e7836b5a1eb8103f Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Mon, 27 Jun 2022 18:42:35 -0400 Subject: [PATCH] Bump Qt version to 5.15.2 (LTS) now that VTK-9 is working (#977) * Bump Qt version to 5.15.2 (LTS) now that VTK9 is working Signed-off-by: Geoff Hutchison --- .github/workflows/add_artifact_urls.yml | 2 +- .github/workflows/build_cmake.yml | 2 +- .github/workflows/build_m1.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/add_artifact_urls.yml b/.github/workflows/add_artifact_urls.yml index 075044ea75..c6aad961e8 100644 --- a/.github/workflows/add_artifact_urls.yml +++ b/.github/workflows/add_artifact_urls.yml @@ -1,7 +1,7 @@ name: add artifact links to pull request and related issues on: workflow_run: - workflows: ['CMake Build Matrix', 'CMake Self-Hosted'] + workflows: ['CMake Build Matrix'] types: [completed] jobs: diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 7dd6554a1d..a88621af09 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,7 +7,7 @@ name: CMake Build Matrix on: [push, pull_request, workflow_dispatch] env: - QT_VERSION: 5.12.12 + QT_VERSION: 5.15.2 # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems # we set MACOSX_DEPLOYMENT_TARGET later MACOS_TARGET: 10.12 diff --git a/.github/workflows/build_m1.yml b/.github/workflows/build_m1.yml index 36d6f3846d..28a38950bd 100644 --- a/.github/workflows/build_m1.yml +++ b/.github/workflows/build_m1.yml @@ -6,7 +6,7 @@ env: # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems # we set MACOSX_DEPLOYMENT_TARGET later MACOS_TARGET: 10.12 - FEATURES: -DUSE_VTK=OFF -DBUILD_GPL_PLUGINS=ON -DWITH_COORDGEN=OFF + FEATURES: -DUSE_VTK=ON -DBUILD_GPL_PLUGINS=ON -DWITH_COORDGEN=OFF jobs: build: