From 4cfebb83195646dc2d0c6174db350abbbf3a02bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20=22Pisco=22=20Fernandes?=
 <joaocarlos@cloudflare.com>
Date: Thu, 6 Nov 2025 10:50:33 +0000
Subject: [PATCH] TUN-9800: Prefix gitlab steps with operating system

---
 .ci/linux.gitlab-ci.yml   | 8 ++++----
 .ci/mac.gitlab-ci.yml     | 6 +++---
 .ci/release.gitlab-ci.yml | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.ci/linux.gitlab-ci.yml b/.ci/linux.gitlab-ci.yml
index a751a24e..92cfdc79 100644
--- a/.ci/linux.gitlab-ci.yml
+++ b/.ci/linux.gitlab-ci.yml
@@ -9,7 +9,7 @@
   CGO_ENABLED: 1
 
 .default-packaging-job: &packaging-job-defaults
-  stage: build
+  stage: package
   needs:
     - ci-image-get-image-ref
   rules:
@@ -73,7 +73,7 @@ include:
 #################################
 ### Run Linux Component Tests ###
 #################################
-component-tests-linux: &component-tests-linux
+linux-component-tests: &linux-component-tests
   stage: test
   extends: .component-tests
   needs:
@@ -93,8 +93,8 @@ component-tests-linux: &component-tests-linux
 ######################################
 ### Run Linux FIPS Component Tests ###
 ######################################
-component-tests-linux-fips:
-  <<: *component-tests-linux
+linux-component-tests-fips:
+  <<: *linux-component-tests
   needs:
     - ci-image-get-image-ref
     - linux-fips-build-boring-make
diff --git a/.ci/mac.gitlab-ci.yml b/.ci/mac.gitlab-ci.yml
index 94e16fbd..321adf5d 100644
--- a/.ci/mac.gitlab-ci.yml
+++ b/.ci/mac.gitlab-ci.yml
@@ -17,7 +17,7 @@ include:
 ######################################
 ### Build Cloudflared Mac Binaries ###
 ######################################
-build-cloudflared-macos: &build-mac
+macos-build-cloudflared: &mac-build
   <<: *mac-build-defaults
   stage: build
   artifacts:
@@ -38,8 +38,8 @@ build-cloudflared-macos: &build-mac
 ###############################################
 ### Build and Sign Cloudflared Mac Binaries ###
 ###############################################
-build-and-sign-cloudflared-macos:
-  <<: *build-mac
+macos-build-and-sign-cloudflared:
+  <<: *mac-build
   rules:
     - !reference [.default-rules, run-on-master]
   secrets:
diff --git a/.ci/release.gitlab-ci.yml b/.ci/release.gitlab-ci.yml
index 8bafffe1..ab417812 100644
--- a/.ci/release.gitlab-ci.yml
+++ b/.ci/release.gitlab-ci.yml
@@ -28,7 +28,7 @@ include:
   cache:
     paths:
       - .cache/pip
-  variables:
+  variables: &release-job-variables
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
     # KV Vars
     KV_NAMESPACE: 380e19aa04314648949b6ad841417ebe
@@ -73,10 +73,10 @@ release-cloudflared-to-github:
   <<: *release-job-defaults
   extends: .check-tag
   needs:
-    - build-and-sign-cloudflared-macos
     - ci-image-get-image-ref
     - linux-packaging
     - linux-packaging-fips
+    - macos-build-and-sign-cloudflared
     - windows-package-sign
   script:
     - ./.ci/scripts/release-target.sh github-release
@@ -100,6 +100,7 @@ release-cloudflared-to-r2:
 release-cloudflared-nightly-to-r2:
   <<: *release-job-defaults
   variables:
+    <<: *release-job-variables
     R2_BUCKET: cloudflared-pkgs-next
     GPG_PUBLIC_KEY_URL: "https://next.pkg.cloudflare.com/cloudflare-ascii-pubkey.gpg"
     PKG_URL: "https://next.pkg.cloudflare.com/cloudflared"