Merge topic 'ci-arch-tags' into release-1.7

c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
This commit is contained in:
Ben Boeckel 2022-12-21 17:28:20 +00:00 committed by Kitware Robot
commit 9d78e44508
8 changed files with 37 additions and 34 deletions

@ -6,7 +6,7 @@ build:centos7_gcc73:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -24,7 +24,7 @@ test:centos7_gcc73:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- turing
extends:
@ -41,7 +41,7 @@ test:rhel8_test_centos7:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- turing
extends:

@ -6,7 +6,7 @@ build:centos8_sanitizer:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .centos8
- .cmake_build_linux
@ -21,7 +21,7 @@ test:centos8_sanitizer:
- test
- vtkm
- docker
- linux
- linux-x86_64
- privileged
extends:
- .centos8

@ -16,9 +16,10 @@ doxygen:
timeout: 30 minutes
interruptible: true
tags:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu2004_doxygen
before_script:

@ -6,7 +6,7 @@ build:rhel8:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .rhel8
- .cmake_build_linux
@ -20,7 +20,7 @@ test:rhel8:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .rhel8
- .cmake_test_linux
@ -37,7 +37,7 @@ build:rhel8_vtk_types:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .rhel8
- .cmake_build_linux
@ -51,7 +51,7 @@ test:rhel8_vtk_types:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .rhel8
- .cmake_test_linux

@ -6,7 +6,7 @@ build:ubuntu1604_gcc5:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -25,7 +25,7 @@ test:ubuntu1604_gcc5:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- pascal
extends:
@ -44,7 +44,7 @@ build:ubuntu1604_gcc5_2:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -63,7 +63,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- pascal
extends:
@ -84,7 +84,7 @@ build:ubuntu1604_clang5:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1604
- .cmake_build_linux
@ -101,7 +101,7 @@ test:ubuntu1604_clang5:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1604
- .cmake_test_linux

@ -7,7 +7,7 @@ build:ubuntu1804_gcc9:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_build_linux
@ -23,7 +23,7 @@ test:ubuntu1804_gcc9:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_test_linux
@ -45,7 +45,7 @@ build:ubuntu1804_gcc7:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -63,7 +63,7 @@ test:ubuntu1804_gcc7:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- turing
extends:
@ -84,7 +84,7 @@ build:ubuntu1804_clang_cuda:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -103,7 +103,7 @@ test:ubuntu1804_clang_cuda:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- pascal
extends:
@ -123,7 +123,7 @@ build:ubuntu1804_gcc6:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_build_linux
@ -138,7 +138,7 @@ test:ubuntu1804_gcc6:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_test_linux
@ -159,7 +159,7 @@ build:ubuntu1804_clang8:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_build_linux
@ -175,7 +175,7 @@ test:ubuntu1804_clang8:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu1804
- .cmake_test_linux
@ -192,7 +192,7 @@ build:ubuntu1804_kokkos:
- build
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- large-memory
extends:
@ -209,7 +209,7 @@ test:ubuntu1804_kokkos:
- test
- vtkm
- docker
- linux
- linux-x86_64
- cuda-rt
- turing
extends:

@ -3,7 +3,7 @@ build:ubuntu2004_gcc9:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu2004
- .cmake_build_linux
@ -17,7 +17,7 @@ test:ubuntu2004_gcc9:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu2004
- .cmake_test_linux
@ -36,7 +36,7 @@ build:ubuntu2004_kokkos:
- build
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu2004_kokkos
- .cmake_build_linux
@ -50,7 +50,7 @@ test:ubuntu2004_kokkos:
- test
- vtkm
- docker
- linux
- linux-x86_64
extends:
- .ubuntu2004_kokkos
- .cmake_test_linux
@ -65,6 +65,7 @@ build:ubuntu2004_hip_kokkos:
- build
- vtkm
- docker
- linux-x86_64
- radeon
extends:
- .ubuntu2004_hip_kokkos
@ -82,6 +83,7 @@ test:ubuntu2004_hip_kokkos:
- build
- vtkm
- docker
- linux-x86_64
- radeon
extends:
- .ubuntu2004_hip_kokkos

@ -86,7 +86,7 @@ build:windows_vs2019:
- vtkm # Since this is a bare runner, pin to a project.
- nonconcurrent
- build
- windows
- windows-x86_64
- shell
- vs2019
- msvc-19.25
@ -106,7 +106,7 @@ test:windows_vs2019:
- vtkm # Since this is a bare runner, pin to a project.
- nonconcurrent
- test
- windows
- windows-x86_64
- shell
- vs2019
- msvc-19.25