reenable the branch binding for deployments

master
jem 3 years ago
parent 746d72662e
commit 5546bf98b3

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