Merge branch 'rm-mac-amd64' into 'master'

[ci] Remove amd64 job, enable gui on arm64.

See merge request ogs/ogs!5089

scripts/ci/jobs/build-gui-mac.yml

@@ -5,16 +5,17 @@ build gui mac:
  stage: build
  tags:
  - mac
- - ${ARCHITECTURE}
+ - arm64
  needs: [meta]
  rules:
  - if: '$CI_COMMIT_BRANCH == "master"'
  - changes:
  - Applications/DataExplorer/**/*
+ - scripts/ci/jobs/build-gui-mac.yml
  - when: manual
  allow_failure: true
  variables:
  CMAKE_PRESET: release-gui
- parallel:
- matrix:
- - ARCHITECTURE: ["amd64"] # "arm64" not supported yet
+  CMAKE_ARGS: >-
+  -DOGS_USE_NETCDF=OFF
+ -DQt5_DIR=/opt/qt/5.15.14/lib/cmake/Qt5

scripts/ci/jobs/build-mac-petsc.yml

@@ -1,7 +1,5 @@
-build mac petsc arm64:
- tags:
- - mac
- - arm64
+build mac petsc:
+ tags: [mac, arm64]
  extends:
  - .template-build-linux
  - .test-artifacts
@@ -13,22 +11,3 @@ build mac petsc arm64:
  CMAKE_PRESET: release-petsc
  CMAKE_ARGS: >-
  -DOGS_USE_PIP=ON
-
-build mac petsc amd64:
- tags:
- - mac
- - amd64
- extends:
- - .template-build-linux
- - .test-artifacts
- needs: [meta]
- rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
- - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- - when: manual
- allow_failure: true
- variables:
- CMAKE_PRESET: release-petsc
- CMAKE_ARGS: >-
- -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
- -DOGS_BUILD_HDF5=ON

scripts/ci/jobs/build-mac.yml

@@ -1,25 +1,11 @@
 build mac:
- tags:
- - mac
- - ${ARCHITECTURE}
+ tags: [mac, arm64]
  extends:
  - .template-build-linux
  - .test-artifacts
  needs: [meta]
- rules:
- - if: '$ARCHITECTURE == "amd64"'
- variables:
- CTEST_ARGS: "-E LARGE" # disable large notebook tests
- - if: '$ARCHITECTURE == "arm64"'
- - if: '$CI_COMMIT_BRANCH == "master"'
- - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- - when: manual
- allow_failure: true
  variables:
  CHECK_WARNINGS: "true"
  CMAKE_PRESET: release-all
  CMAKE_ARGS: >-
  -DOGS_BUILD_HDF5=ON
- parallel:
- matrix:
- - ARCHITECTURE: ["amd64", "arm64"]

scripts/ci/jobs/build-wheels.yml

@@ -50,14 +50,9 @@ build wheels linux:
  <<: *wheels_template
 
 build wheels mac:
- tags:
- - mac
- - ${ARCHITECTURE}
+ tags: [mac, arm64]
  variables:
  CMAKE_OSX_DEPLOYMENT_TARGET: "10.15"
- parallel:
- matrix:
- - ARCHITECTURE: ["amd64", "arm64"]
  <<: *wheels_template
 
 build wheels win:

scripts/cmake/DependenciesExternalProject.cmake

@@ -467,6 +467,10 @@ if(NOT VTK_FOUND)
  endif()
  endif()
 
+ if(DEFINED Qt5_DIR)
+ list(APPEND VTK_OPTIONS "-DQt5_DIR=${Qt5_DIR}")
+ endif()
+
  BuildExternalProject(
  VTK ${_vtk_source} CMAKE_ARGS ${VTK_OPTIONS} ${_defaultCMakeArgs}
  ${_vtk_patch} ${_cmake_generator}