Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Qt version to 5.15.2 (LTS) now that VTK-9 is working #977

Merged
merged 3 commits into from
Jun 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add_artifact_urls.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down