From d28a2b22c52e520d6fe594f327621ad44409a280 Mon Sep 17 00:00:00 2001
From: Cat Flynn <me@ktyl.dev>
Date: Fri, 29 Jan 2021 18:46:49 +0000
Subject: [PATCH] validated ci config

---
 .gitlab-ci.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8900e4d..dff603d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
 
   SRC_DIR: ./game
   BUILD_DIR: ./game/Build
+  DEV_BRANCH: feature/cd
 
 build:
   stage: build
@@ -20,15 +21,10 @@ build:
     paths:
     - $BUILD_DIR
 
-.deploy: &deploy
-  stage: deploy
-  dependencies:
-  - build
-
 deploy-dev:
-  <<: *deploy
+  stage: deploy
   rules:
-  - if: $CI_COMMIT_BRANCH == "feature/cd"
+  - if: $CI_COMMIT_BRANCH == $DEV_BRANCH
   variables:
     ITCH_USER: "cyndrdev"
     ITCH_GAME: "revival-internal-track"
@@ -40,10 +36,9 @@ deploy-dev:
   - build
 
 deploy-release:
-  <<: *deploy
+  stage: deploy
   rules:
-  - if: $CI_COMMIT_TAG
-  - if: $CI_COMMIT_BRANCH ~= "feature/cd"
+  - if: $CI_COMMIT_TAG && $CI_COMMIT_BRANCH != $DEV_BRANCH
   variables:
     ITCH_USER: "cyndrdev"
     ITCH_GAME: "revival"