From d3a247961489853e6f2524c69a8d99571b1fb821 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 21 Jun 2021 00:47:56 +0530 Subject: [PATCH 1/4] Add workaround for #989774 (install google-protobuf from rubygems.org) --- debian/rake-tasks.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index d500ef8269..f95ee773dd 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -10,6 +10,8 @@ cd /usr/share/gitlab # Workaround for #966653 /usr/bin/gem install -v 1.30.2 grpc +# Workaround for #989774 +/usr/bin/gem install -v 3.17.1 google-protobuf # Remove all lines from Gemfile.lock runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \ truncate -s 0 ${gitlab_data_dir}/Gemfile.lock" From 27a7b7ef1ff4f3e282818e2bede11758da45bb71 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 21 Jun 2021 01:03:21 +0530 Subject: [PATCH 2/4] Upload to experimental --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index da5e295c65..b1cde6b279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gitlab (13.12.3+ds1-5) experimental; urgency=medium + + * Add workaround for #989774 (install google-protobuf from rubygems.org) + + -- Pirate Praveen Mon, 21 Jun 2021 01:03:03 +0530 + gitlab (13.12.3+ds1-4) experimental; urgency=medium * Update minimum version of ruby-gitlab-experiment to 0.5.4 From 1bcb4acac801ddf67871982b61a718f4ede77f3b Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 21 Jun 2021 14:09:06 +0530 Subject: [PATCH 3/4] Move gem install to start of postinst, before regenerating Gemfile.lock --- debian/gitlab.postinst | 5 +++++ debian/rake-tasks.sh | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index f4444d9949..6badff21bb 100755 --- a/debian/gitlab.postinst +++ b/debian/gitlab.postinst @@ -61,6 +61,11 @@ export GEM_HOME=/var/lib/gitlab/.gem # Read gitlab_user from gitlab-common.conf test -f ${gitlab_common_conf} && . ${gitlab_common_conf} +# Workaround for #966653 +/usr/bin/gem install -v 1.30.2 grpc +# Workaround for #989774 +/usr/bin/gem install -v 3.17.1 google-protobuf + ####################################################################### # update Gemfile.lock and yarn.lock, always ####################################################################### diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh index f95ee773dd..90242b4dba 100755 --- a/debian/rake-tasks.sh +++ b/debian/rake-tasks.sh @@ -8,10 +8,6 @@ export DB RAILS_ENV cd /usr/share/gitlab -# Workaround for #966653 -/usr/bin/gem install -v 1.30.2 grpc -# Workaround for #989774 -/usr/bin/gem install -v 3.17.1 google-protobuf # Remove all lines from Gemfile.lock runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \ truncate -s 0 ${gitlab_data_dir}/Gemfile.lock" From 590946626459c3a7dbd62b1bc08efe7bc40f8be0 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 21 Jun 2021 14:10:25 +0530 Subject: [PATCH 4/4] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b1cde6b279..ca2354cdbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (13.12.3+ds1-6) experimental; urgency=medium + + * Move gem install to start of postinst, before regenerating Gemfile.lock + (Closes: #990103) + + -- Pirate Praveen Mon, 21 Jun 2021 14:09:44 +0530 + gitlab (13.12.3+ds1-5) experimental; urgency=medium * Add workaround for #989774 (install google-protobuf from rubygems.org)