From 87738b964e781f05b43dd5e92d669c70413f6841 Mon Sep 17 00:00:00 2001
From: Russell Ballestrini <russell.ballestrini@gmail.com>
Date: Mon, 3 Mar 2025 15:30:16 -0500
Subject: [PATCH] 	new file:   .gitlab-ci.deploy.yml 	modified:  
 .gitlab-ci.yml

---
 .gitlab-ci.deploy.yml | 28 ++++++++++++++++++++++++++++
 .gitlab-ci.yml        | 33 ++++++++-------------------------
 2 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 .gitlab-ci.deploy.yml

diff --git a/.gitlab-ci.deploy.yml b/.gitlab-ci.deploy.yml
new file mode 100644
index 0000000..eec25ba
--- /dev/null
+++ b/.gitlab-ci.deploy.yml
@@ -0,0 +1,28 @@
+# We MUST have a separate pipeline otherwise the artifacts are stale!
+# this is why we use an include file instead of a single file!
+stages:
+  - deploy
+
+memopoly.com:
+  stage: deploy
+  tags: ["memopoly.com"]
+  needs:
+    - build
+  script:
+    # publish build to Salt Master
+    - sudo /opt/salt-call-state-highstate.sh
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "develop"'
+    - if: '$CI_COMMIT_BRANCH == "master"'
+
+
+my.makepostsell.com:
+  stage: deploy
+  tags: ["my.makepostsell.com"]
+  needs:
+    - build
+  script:
+    # publish build to Salt Master
+    - sudo /opt/salt-call-state-highstate.sh
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 908d8b7..cbc996f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,31 +42,14 @@ build:
     expire_in: 1 month
     when: always
 
-
-#memopoly.com:
-#  stage: deploy
-#  tags: ["memopoly.com"]
-#  needs:
-#    - build
-#  script:
-#    # publish build to Salt Master
-#    - sudo /opt/salt-call-state-highstate.sh
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "develop"'
-#    - if: '$CI_COMMIT_BRANCH == "master"'
-#
-#
-#my.makepostsell.com:
-#  stage: deploy
-#  tags: ["my.makepostsell.com"]
-#  needs:
-#    - build
-#  script:
-#    # publish build to Salt Master
-#    - sudo /opt/salt-call-state-highstate.sh
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "master"'
-
+deploy:
+  stage: deploy
+  needs: [build]
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"'
+      when: on_success
+  trigger:
+    include: .gitlab-ci.deploy.yml
 
 pypi-twine:
   stage: pypi-twine