diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_assets_image | 4 | ||||
| -rwxr-xr-x | scripts/lint-changelog-yaml | 2 | ||||
| -rwxr-xr-x | scripts/security-harness | 2 | ||||
| -rwxr-xr-x | scripts/static-analysis | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 4e5ef977161..9afada244c8 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -22,6 +22,8 @@ mkdir -p assets_container.build/public cp -r public/assets assets_container.build/public/ cp Dockerfile.assets assets_container.build/ docker build -t ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} -f assets_container.build/Dockerfile.assets assets_container.build/ +docker tag ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} ${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA} docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} -docker push ${ASSETS_IMAGE_PATH} +docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} +docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA} diff --git a/scripts/lint-changelog-yaml b/scripts/lint-changelog-yaml index 6553e02ffca..06d502c4676 100755 --- a/scripts/lint-changelog-yaml +++ b/scripts/lint-changelog-yaml @@ -3,7 +3,7 @@ require 'yaml' invalid_changelogs = Dir['changelogs/**/*'].reject do |changelog| - next true if changelog =~ /(archive\.md|unreleased(-ee)?)$/ + next true if changelog =~ /((README|archive)\.md|unreleased(-ee)?)$/ next false unless changelog.end_with?('.yml') begin diff --git a/scripts/security-harness b/scripts/security-harness index c60b3410095..8369cf06223 100755 --- a/scripts/security-harness +++ b/scripts/security-harness @@ -37,7 +37,7 @@ else end __END__ -#!/bin/sh +#!/bin/bash set -e diff --git a/scripts/static-analysis b/scripts/static-analysis index 25ba7ec6c8e..642c50ec0a8 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -29,6 +29,7 @@ tasks = [ %w[bin/rake lint:all], %w[bundle exec license_finder], %w[yarn run eslint], + %w[yarn run stylelint], %w[yarn run prettier-all], %w[bundle exec rubocop --parallel], %w[scripts/lint-conflicts.sh], |