From 0c898084cd0f3abf82a40ad82d384952dcb3def5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Thu, 26 Mar 2020 11:03:52 +0100
Subject: [PATCH] Include compiler name in all build/test job names

Most build/test job names already contain a "clang", "gcc", or "msvc"
prefix which indicates the compiler used for a given job.  Apply that
naming convention to all build/test job names.
---
 .gitlab-ci.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e991a76aa7..d7787feed1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -683,7 +683,7 @@ cppcheck:
 
 # Job for out-of-tree GCC build on Debian Sid (amd64)
 
-out-of-tree:
+gcc:out-of-tree:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
@@ -696,7 +696,7 @@ out-of-tree:
 
 # Jobs for tarball GCC builds on Debian Sid (amd64)
 
-tarball:
+gcc:tarball:
   variables:
     CC: gcc
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
@@ -713,25 +713,25 @@ tarball:
   only:
     - tags
 
-system:tarball:
+system:gcc:tarball:
   <<: *base_image
   <<: *system_test_job
   before_script:
     - cd bind-*
     - *setup_interfaces
   needs:
-    - job: tarball
+    - job: gcc:tarball
       artifacts: true
   only:
     - tags
 
-unit:tarball:
+unit:gcc:tarball:
   <<: *base_image
   <<: *unit_test_job
   before_script:
     - cd bind-*
   needs:
-    - job: tarball
+    - job: gcc:tarball
       artifacts: true
   only:
     - tags
@@ -993,7 +993,7 @@ unit:clang:tsan:
       artifacts: true
 
 # Jobs for mutex-based atomics on Debian SID (amd64)
-mutexatomics:
+gcc:mutexatomics:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -DISC_MEM_USE_INTERNAL_MALLOC=0"
@@ -1001,18 +1001,18 @@ mutexatomics:
   <<: *base_image
   <<: *build_job
 
-system:mutexatomics:
+system:gcc:mutexatomics:
   <<: *base_image
   <<: *system_test_job
   needs:
-    - job: mutexatomics
+    - job: gcc:mutexatomics
       artifacts: true
 
-unit:mutexatomics:
+unit:gcc:mutexatomics:
   <<: *base_image
   <<: *unit_test_job
   needs:
-    - job: mutexatomics
+    - job: gcc:mutexatomics
       artifacts: true
 
 # Jobs for Clang builds on Debian Buster (amd64)
@@ -1041,7 +1041,7 @@ unit:clang:buster:amd64:
 
 # Jobs for PKCS#11-enabled GCC builds on Debian Sid (amd64)
 
-pkcs11:
+gcc:pkcs11:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
@@ -1049,18 +1049,18 @@ pkcs11:
   <<: *base_image
   <<: *build_job
 
-system:pkcs11:
+system:gcc:pkcs11:
   <<: *base_image
   <<: *system_test_job
   needs:
-    - job: pkcs11
+    - job: gcc:pkcs11
       artifacts: true
 
-unit:pkcs11:
+unit:gcc:pkcs11:
   <<: *base_image
   <<: *unit_test_job
   needs:
-    - job: pkcs11
+    - job: gcc:pkcs11
       artifacts: true
 
 # Jobs for Clang builds on FreeBSD 11.3 (amd64)