Commit 1e3b7a04 authored by Jacob Vosmaer's avatar Jacob Vosmaer 💬

Merge branch 'fix_pages_version' into 'master'

Make sure gitlab-pages is updated on gdk update

See merge request !585
parents 1141d33a 1285d6ff
Pipeline #43248811 passed with stages
in 17 minutes and 54 seconds
...@@ -50,6 +50,7 @@ ruby_version = UNKNOWN ...@@ -50,6 +50,7 @@ ruby_version = UNKNOWN
workhorse_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITLAB_WORKHORSE_VERSION") 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") 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") gitaly_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITALY_SERVER_VERSION")
pages_version = $(shell bin/resolve-dependency-commitish "${gitlab_development_root}/gitlab/GITLAB_PAGES_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
...@@ -222,9 +223,9 @@ self-update: unlock-dependency-installers ...@@ -222,9 +223,9 @@ self-update: unlock-dependency-installers
git fetch && \ git fetch && \
support/self-update-git-worktree support/self-update-git-worktree
# Update gitlab, gitlab-shell, gitlab-workhorse and gitaly # Update gitlab, gitlab-shell, gitlab-workhorse, gitlab-pages and gitaly
update: ensure-postgres-running unlock-dependency-installers gitlab-shell-update gitlab-workhorse-update gitaly-update gitlab-update update: ensure-postgres-running unlock-dependency-installers gitlab-shell-update gitlab-workhorse-update gitlab-pages-update gitaly-update gitlab-update
ensure-postgres-running: ensure-postgres-running:
@test -f ${postgres_data_dir}/postmaster.pid || \ @test -f ${postgres_data_dir}/postmaster.pid || \
...@@ -450,8 +451,8 @@ ${gitlab_pages_clone_dir}/.git: ...@@ -450,8 +451,8 @@ ${gitlab_pages_clone_dir}/.git:
gitlab-pages/.git/pull: gitlab-pages/.git/pull:
cd ${gitlab_pages_clone_dir} && \ cd ${gitlab_pages_clone_dir} && \
git stash &&\ git stash &&\
git checkout master &&\ git fetch --all --tags --prune && \
git pull --ff-only git checkout "${pages_version}"
influxdb-setup: influxdb/influxdb.conf influxdb/bin/influxd influxdb/meta/meta.db influxdb-setup: influxdb/influxdb.conf influxdb/bin/influxd influxdb/meta/meta.db
......
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