From af4b44525775ce855daf2f447fe9b43a49f618cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= Date: Wed, 4 Jun 2025 15:22:12 +0200 Subject: [PATCH] Clean up the definitions and usages of `&unit_test_*` anchors Remove redundant indirections and overwrites. (cherry picked from commit 4303e0691968824ae8b8938e1ab121386f32f83a) --- .gitlab-ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08d0e8dbd7..a1b9b113af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -495,7 +495,7 @@ stages: - *find_python - *parse_tsan -.unit_test_common: &unit_test_common +.unit_test_common: &unit_test_job <<: *default_triggering_rules stage: unit before_script: @@ -521,14 +521,8 @@ stages: reports: junit: junit.xml -.unit_test: &unit_test_job - <<: *unit_test_common - -.unit_test_gcov: &unit_test_gcov_job - <<: *unit_test_common - .unit_test_tsan: &unit_test_tsan_job - <<: *unit_test_common + <<: *unit_test_job after_script: - *find_python - *parse_tsan @@ -1013,7 +1007,7 @@ system:gcc:bookworm:amd64: unit:gcc:bookworm:amd64: <<: *debian_bookworm_amd64_image - <<: *unit_test_gcov_job + <<: *unit_test_job variables: CI_ENABLE_ALL_TESTS: 1 CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0