diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/codequality | 19 | ||||
| -rwxr-xr-x | scripts/trigger-build-omnibus | 3 |
2 files changed, 2 insertions, 20 deletions
diff --git a/scripts/codequality b/scripts/codequality deleted file mode 100755 index 2f3ccef7d2d..00000000000 --- a/scripts/codequality +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -eo pipefail - -code_path=$(pwd) - -# docker run --tty will merge stderr and stdout, we don't need this on CI or -# it will break codequality json file -[ "$CI" != "" ] || docker_tty="--tty" - -# The codebase and instructions for the following image can be found at https://gitlab.com/gitlab-org/codeclimate-rubocop/wikis/home -docker pull dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1 > /dev/null -docker tag dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1 codeclimate/codeclimate-rubocop:gitlab-codeclimate-rubocop-0-52-1 > /dev/null - -exec docker run --rm $docker_tty --env CODECLIMATE_CODE="$code_path" \ - --volume "$code_path":/code \ - --volume /var/run/docker.sock:/var/run/docker.sock \ - --volume /tmp/cc:/tmp/cc \ - "codeclimate/codeclimate:${CODECLIMATE_VERSION:-0.71.1}" "$@" diff --git a/scripts/trigger-build-omnibus b/scripts/trigger-build-omnibus index 85ea4aa74ac..95f35b44f5a 100755 --- a/scripts/trigger-build-omnibus +++ b/scripts/trigger-build-omnibus @@ -9,6 +9,7 @@ module Omnibus class Trigger TOKEN = ENV['BUILD_TRIGGER_TOKEN'] + TRIGGERER = ENV['CI_PROJECT_NAME'] def initialize @uri = URI("https://gitlab.com/api/v4/projects/#{CGI.escape(Omnibus::PROJECT_PATH)}/trigger/pipeline") @@ -32,7 +33,7 @@ module Omnibus private def ee? - File.exist?('CHANGELOG-EE.md') + TRIGGERER == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') end def env_params |