diff --git a/debian/changelog b/debian/changelog index 0bb1fdd99c..d47016f593 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (15.7.8+ds1-9) experimental; urgency=medium + + * Install fog-core 2.1.0 using gem install in postinst (for fog-google) + * Switch to ruby-fog-google from the archive + + -- Pirate Praveen Thu, 09 Mar 2023 23:59:37 +0530 + gitlab (15.7.8+ds1-8~fto11+1) bullseye-fasttrack; urgency=medium * Rebuild for bullseye-fasttrack. diff --git a/debian/control b/debian/control index edce75f682..58b1c1aa15 100644 --- a/debian/control +++ b/debian/control @@ -195,7 +195,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-fog-aws (>= 3.15~), ruby-fog-core (>= 2.1~), ruby-excon (>= 0.72~), - ruby-fog-google (>= 1.15~), + ruby-fog-google (>= 1.19~), ruby-fog-local (>= 0.8~), ruby-fog-openstack (>= 1.0~), ruby-fog-rackspace (>= 0.1.1~), diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index 18a9f48722..1ababdad04 100755 --- a/debian/gitlab.postinst +++ b/debian/gitlab.postinst @@ -71,15 +71,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i "^gitlab-dangerfiles$" >/de # TODO: Update packages for these gems runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.0.12' "^arr-pm$" >/dev/null; then gem install -v '~> 0.0.12' arr-pm; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.12' "^google-apis-monitoring_v3$" >/dev/null; then gem install -v '~>0.12' google-apis-monitoring_v3; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.6' "^google-apis-iamcredentials_v1$" >/dev/null; then gem install -v '~> 0.6' google-apis-iamcredentials_v1; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.12' "^google-apis-dns_v1$" >/dev/null; then gem install -v '~> 0.12' google-apis-dns_v1; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.6' "^google-apis-storage_v1$" >/dev/null; then gem install -v '~> 0.6' google-apis-storage_v1; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.4 "google-apis-core$" >/dev/null; then gem install -v 0.4 google-apis-core; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.14' "^google-apis-compute_v1$" >/dev/null; then gem install -v '~> 0.14' google-apis-compute_v1; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.13' "^google-apis-sqladmin_v1beta4$" >/dev/null; then gem install -v '~> 0.13' google-apis-sqladmin_v1beta4; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7' "^google-apis-pubsub_v1$" >/dev/null; then gem install -v '~> 0.7' google-apis-pubsub_v1; fi" -runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.19' "^fog-google$" >/dev/null; then gem install -v '~> 1.19' fog-google; fi" runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/null; then gem install -v 1.2.2 ipaddr; fi" # Packaged version is probably buggy - task lists on issues broken runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.3.2 "^deckar01-task_list$" >/dev/null; then gem install -v 2.3.2 deckar01-task_list; fi" @@ -93,6 +84,10 @@ if [ "$(gem which gitlab-labkit)" = "/var/lib/gitlab/.gem/gems/gitlab-labkit-0.2 runuser -u ${gitlab_user} -- sh -c "gem uninstall -v '~> 0.29.0' gitlab-labkit" fi +# Gitlab needs this specific version due to +# https://github.com/fog/fog-google/issues/421 +runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.1.0 "^fog-core$" >/dev/null; then gem install -v 2.1.0 fog-core; fi" + ####################################################################### # update Gemfile.lock and yarn.lock, always #######################################################################