Upload to bullseye-fasttrack

Merge tag 'debian/15.9.8+ds1-3' into bullseye-fasttrack
2023-05-26 03:24:30 +05:30 · 2023-05-24 19:40:05 +05:30 · 2023-05-24 19:39:33 +05:30 · 2023-05-16 01:54:01 +05:30 · 2023-05-16 01:54:00 +05:30 · 2023-05-16 01:09:41 +05:30
5 changed files with 34 additions and 3 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,15 @@
+gitlab (15.9.8+ds1-3~fto11+2) bullseye-fasttrack; urgency=medium
+
+  * Second rebuild without fasttrack-staging
+
+ -- Pirate Praveen <praveen@debian.org>  Fri, 26 May 2023 03:24:25 +0530
+
+gitlab (15.9.8+ds1-3~fto11+1) bullseye-fasttrack; urgency=medium
+
+  * Rebuild for bullseye-fasttrack.
+
+ -- Pirate Praveen <praveen@debian.org>  Wed, 24 May 2023 19:39:38 +0530
+
 gitlab (15.9.8+ds1-3) experimental; urgency=medium

  * Update minimum version of ruby-zeitwerk to 2.6.1~ (this fixes gitlab-puma
--- a/debian/clean
+++ b/debian/clean
@ -1,3 +1,6 @@
+# Created for babeljs/older nodejs compat
+node_modules/
+
 ## Debian CI:
 debian/.gitlab-ci.yml

--- a/debian/control
+++ b/debian/control
@ -62,11 +62,15 @@ Build-Depends: debhelper-compat (= 13),
               golang-procfs-dev,
 # protobuf-1-5
 #               golang-protobuf-extensions-dev,
-               golang-toml-dev,
-               golang-websocket-dev,
 # protobuf-1-5
 #               golang-google-grpc-dev (>= 1.38~),
+               golang-toml-dev,
+               golang-websocket-dev,
               libimage-exiftool-perl,
+# Need this to transpile some javascript to work on nodejs in bullseye
+               node-babel-cli,
+               node-babel7 (<< 7.18~) | node-babel-helper-define-polyfill-provider,
+               node-babel-plugin-lodash,
               golang-github-kylelemons-godebug-dev,
               golang-github-cli-browser-dev
 Standards-Version: 4.6.1
@ -419,7 +423,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 #
 ruby-grpc (>= 1.42~),
 #
- ruby-google-protobuf (>= 3.19.4~),
+ ruby-google-protobuf (>= 1:3.21~),
 #
 ruby-toml-rb (>= 2.2~),
 # Feature toggles
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@ -80,6 +80,8 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/n
 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"
 # We need this version to use newer googleauth
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.53.0 "^google-api-client$" >/dev/null; then gem install -v 0.53.0 google-api-client; fi"
+# we need rack ~> 2.2.6
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.2.6' "^rack$" >/dev/null; then gem install -v '~> 2.2.6' rack; fi"
 # We have a newer incompatible version in the archive
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.10.0 "^google-apis-core$" >/dev/null; then gem install -v 0.10.0 google-apis-core; fi"

--- a/debian/rules
+++ b/debian/rules
@ -44,6 +44,16 @@ override_dh_auto_configure-arch:

 override_dh_auto_build-indep:
 	dh_auto_build -O--package=gitlab -O--buildsystem=ruby -O--with=ruby
+	# Need this since nodejs on bullseye is not supporting some newer syntax
+	# Failed to load '/usr/share/gitlab/config/webpack.config.js' config
+	# [webpack-cli] /etc/gitlab/plugins/graphql_known_operations_plugin.js:38
+	#    .map((x) => x.name?.value)
+	#                       ^
+	mkdir -p node_modules
+	ln -s /usr/share/nodejs/core-js node_modules/
+	ln -s /usr/share/nodejs/@babel node_modules/
+	babeljs config/plugins/graphql_known_operations_plugin.js -o config/plugins/graphql_known_operations_plugin.js
+	rm -rf node_modules

 override_dh_auto_build-arch:
 	dh_auto_build -O--package=gitlab-workhorse -O--buildsystem=golang \