diff options
Diffstat (limited to '.gitlab/os-linux.yml')
| -rw-r--r-- | .gitlab/os-linux.yml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index c171c5887f..decf1b1be7 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -381,19 +381,10 @@ - docker - linux-x86_64 -.linux_x86_64_tags_qt: - tags: - - cmake - - build - - docker - - linux-3.17 # Needed to be able to load Fedora's Qt libraries. - - linux-x86_64 - .linux_x86_64_tags_x11: tags: - cmake - docker - - linux-3.17 # Needed to be able to load Fedora's Qt libraries. - linux-x86_64 - x11 @@ -425,14 +416,6 @@ - docker - linux-aarch64 -.linux_aarch64_tags_qt: - tags: - - cmake - - build - - docker - - linux-aarch64 - - linux-3.17 # Needed to be able to load Fedora's Qt libraries. - ## Linux-specific scripts .before_script_linux: &before_script_linux @@ -591,7 +574,7 @@ extends: - .intelclassic_makefiles - .cmake_test_linux_release - - .linux_x86_64_tags_qt + - .linux_x86_64_tags - .run_manually - .needs_centos6_x86_64 variables: @@ -601,7 +584,7 @@ extends: - .inteloneapi_makefiles - .cmake_test_linux_release - - .linux_x86_64_tags_qt + - .linux_x86_64_tags - .run_manually - .needs_centos6_x86_64 variables: |