new file: .gitlab-ci.deploy.yml

modified:   .gitlab-ci.yml

.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"'

.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