From 5546bf98b31e427774d66af4a860b82eff49108a Mon Sep 17 00:00:00 2001
From: jem <michael.jerger@meissa-gmbh.de>
Date: Fri, 12 Mar 2021 13:54:24 +0100
Subject: [PATCH] reenable the branch binding for deployments

---
 .gitlab-ci.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12d0517..c65c090 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,22 +72,22 @@ package:
       - target/mastodon-bot.js.sha256
       - target/mastodon-bot.js.sha512
 
-# sast:
-#   variables:
-#     SAST_EXCLUDED_ANALYZERS:
-#       bandit, brakeman, flawfinder, gosec, kubesec, phpcs-security-audit,
-#       pmd-apex, security-code-scan, sobelow, spotbugs
-#   stage: security
-#   before_script:
-#     - mkdir -p builds && cp -r target/ builds/
-# include:
-#   - template: Security/SAST.gitlab-ci.yml
+sast:
+  variables:
+    SAST_EXCLUDED_ANALYZERS:
+      bandit, brakeman, flawfinder, gosec, kubesec, phpcs-security-audit,
+      pmd-apex, security-code-scan, sobelow, spotbugs
+  stage: security
+  before_script:
+    - mkdir -p builds && cp -r target/ builds/
+include:
+  - template: Security/SAST.gitlab-ci.yml
 
 upload-cljs-prerelease:
   <<: *js-upload
   stage: upload
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
   script:
     - cp package.json target/npm-build/
     - sed -i 's|SNAPSHOT|'$(date +"%Y%m%d%H%M%S")'|' ./target/npm-build/package.json
@@ -96,8 +96,8 @@ upload-cljs-prerelease:
 upload-clj-prerelease:
   <<: *clj
   stage: upload
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
   script:
     - lein deploy clojars
 
@@ -113,7 +113,7 @@ upload-js-release:
 build:
   image: domaindrivenarchitecture/dda-devops-build:latest
   stage: image
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG != null'
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG != null'
   script:
     - cd infrastructure/docker && pyb image test publish
\ No newline at end of file