reenable the branch binding for deployments

This commit is contained in:
jem 2021-03-12 13:54:24 +01:00
parent 746d72662e
commit 5546bf98b3

View file

@ -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