Split release:deployment job so that release:deployment:tag will use artifacts from its own tag pipeline

CMCDragonkai · CMCDragonkai · commit 66fc3b2b676f · 2022-05-25T15:06:55.000+10:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -380,6 +380,8 @@ integration:prerelease:
   stage: integration
   needs:
     - integration:builds
+    - job: build:prerelease
+      optional: true
     - job: integration:nix
       optional: true
     - job: integration:docker
@@ -431,22 +433,16 @@ integration:prerelease:
 integration:merge:
   stage: integration
   needs:
-    - job: build:merge
-      artifacts: false
+    - build:merge
     - job: integration:nix
       optional: true
-      artifacts: false
     - job: integration:docker
       optional: true
-      artifacts: false
     - job: integration:linux
       optional: true
-      artifacts: false
     - job: integration:windows
       optional: true
-      artifacts: false
     - job: integration:macos
-      artifacts: false
       optional: true
   # Requires mutual exclusion
   resource_group: integration:merge
@@ -475,50 +471,49 @@ integration:merge:
     # Runs on tag pipeline where the tag is a prerelease or release version
     - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
 
-release:deployment:
+release:deployment:branch:
   stage: release
+  # Only needs integration:builds from the staging branch pipeline
   needs:
-    - job: integration:merge
-      optional: true
     - project: $CI_PROJECT_PATH
       job: integration:builds
       ref: staging
       artifacts: true
   # Don't interrupt deploying job
   interruptible: false
-  # Requires mutual exclusion
+  # Requires mutual exclusion (also with release:deployment:tag)
   resource_group: release:deployment
   script:
     - echo 'Perform service deployment for production'
   rules:
     # Runs on master commits and ignores version commits
     - if: $CI_COMMIT_BRANCH == 'master' && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
+
+release:deployment:tag:
+  stage: release
+  # Tag pipelines run independently
+  needs:
+    - integration:builds
+    - integration:merge
+  # Don't interrupt deploying job
+  interruptible: false
+  # Requires mutual exclusion (also with release:deployment:branch)
+  resource_group: release:deployment
+  script:
+    - echo 'Perform service deployment for production'
+  rules:
     # Runs on tag pipeline where the tag is a release version
     - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/
 
 release:distribution:
   stage: release
   needs:
-    - job: integration:merge
-      optional: true
-    - job: release:deployment
-      optional: true
-    - project: $CI_PROJECT_PATH
-      job: build:linux
-      ref: staging
-      artifacts: true
-    - project: $CI_PROJECT_PATH
-      job: build:windows
-      ref: staging
-      artifacts: true
-    - project: $CI_PROJECT_PATH
-      job: build:macos
-      ref: staging
-      artifacts: true
-    - project: $CI_PROJECT_PATH
-      job: integration:builds
-      ref: staging
-      artifacts: true
+    - build:linux
+    - build:windows
+    - build:macos
+    - integration:builds
+    - integration:merge
+    - release:deployment:tag
   # Don't interrupt publishing job
   interruptible: false
   before_script:
