diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 15:09:22 +0300 |
commit | 9d67bc14cb59a27c9877474e77d155173a1dedff (patch) | |
tree | fae9da04bb838c0bf93df6ba7669c15413e99f8e /scripts | |
parent | 9c7b3812a22465b77ee24657ad1b446b81ffbc74 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/prepare_build.sh | 2 | ||||
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 4991e8eae45..a5f8c8b678e 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -2,7 +2,7 @@ export SETUP_DB=${SETUP_DB:-true} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} -export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet" +export BUNDLE_INSTALL_FLAGS="--without=production --without=development --jobs=$(nproc) --path=vendor --retry=3 --quiet" if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle --version diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 31830c13018..74291f6aef4 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -294,11 +294,11 @@ function base_config_changed() { function parse_gitaly_image_tag() { local gitaly_version="${GITALY_VERSION}" - # returns sha if gitaly_version uses a sha - if [[ ${#gitaly_version} -eq 40 ]]; then - echo "${gitaly_version}" - else + # prepend semver version with `v` + if [[ $gitaly_version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?(-ee)?$ ]]; then echo "v${gitaly_version}" + else + echo "${gitaly_version}" fi } |