Commit 62fc3950 authored by Andrew Newdigate's avatar Andrew Newdigate

Fix GDK to reallow branch references in `_VERSION` files

parent 039085b3
Pipeline #40148536 passed with stages
in 19 minutes and 37 seconds
...@@ -47,6 +47,9 @@ rails_bundle_install_cmd := bundle install --jobs 4 --without production $(if $( ...@@ -47,6 +47,9 @@ rails_bundle_install_cmd := bundle install --jobs 4 --without production $(if $(
elasticsearch_version = 6.5.1 elasticsearch_version = 6.5.1
elasticsearch_tar_gz_sha1 = 5903e1913a7c96aad96a8227517c40490825f672 elasticsearch_tar_gz_sha1 = 5903e1913a7c96aad96a8227517c40490825f672
ruby_version = UNKNOWN ruby_version = UNKNOWN
workhorse_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITLAB_WORKHORSE_VERSION")
gitlab_shell_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITLAB_SHELL_VERSION")
gitaly_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITALY_SERVER_VERSION")
all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup gitlab-pages-setup support-setup gitaly-setup prom-setup object-storage-setup all: gitlab-setup gitlab-shell-setup gitlab-workhorse-setup gitlab-pages-setup support-setup gitaly-setup prom-setup object-storage-setup
...@@ -245,7 +248,7 @@ gitlab-shell/.git/pull: ...@@ -245,7 +248,7 @@ gitlab-shell/.git/pull:
cd ${gitlab_development_root}/gitlab-shell && \ cd ${gitlab_development_root}/gitlab-shell && \
git stash && \ git stash && \
git fetch --all --tags --prune && \ git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITLAB_SHELL_VERSION) git checkout "${gitlab_shell_version}"
gitaly-update: gitaly/.git/pull gitaly-clean gitaly/bin/gitaly gitaly-update: gitaly/.git/pull gitaly-clean gitaly/bin/gitaly
...@@ -254,7 +257,7 @@ gitaly/.git/pull: ${gitaly_clone_dir}/.git ${gitaly_proto_clone_dir}/.git ...@@ -254,7 +257,7 @@ gitaly/.git/pull: ${gitaly_clone_dir}/.git ${gitaly_proto_clone_dir}/.git
cd ${gitaly_clone_dir} && \ cd ${gitaly_clone_dir} && \
git stash && \ git stash && \
git fetch --all --tags --prune && \ git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITALY_SERVER_VERSION) git checkout "${gitaly_version}"
cd ${gitaly_proto_clone_dir} && \ cd ${gitaly_proto_clone_dir} && \
git stash && \ git stash && \
git checkout master && \ git checkout master && \
...@@ -428,7 +431,7 @@ gitlab-workhorse/.git/pull: ...@@ -428,7 +431,7 @@ gitlab-workhorse/.git/pull:
cd ${gitlab_workhorse_clone_dir} && \ cd ${gitlab_workhorse_clone_dir} && \
git stash && \ git stash && \
git fetch --all --tags --prune && \ git fetch --all --tags --prune && \
git checkout v$(shell cat ${gitlab_development_root}/gitlab/GITLAB_WORKHORSE_VERSION) git checkout "${workhorse_version}"
gitlab-pages-setup: gitlab-pages/bin/gitlab-pages gitlab-pages-setup: gitlab-pages/bin/gitlab-pages
......
#!/usr/bin/env bash
set -euo pipefail
IFS=$'\n\t'
version_file="${1}"
version="$(cat "${version_file}")"
case "$version" in
=*)
echo "${version#"="}"
;;
*)
echo "v${version}"
;;
esac
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment