From 331a8e92b309638db9cfe6f4062b4f2b600b45c0 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Fri, 19 Jan 2024 12:36:06 -0500
Subject: [PATCH] user/gitlab-foss: upgrade to 16.8.0

---
 user/gitlab-foss/APKBUILD | 41 ++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD
index 4e67952..74ba6f3 100644
--- a/user/gitlab-foss/APKBUILD
+++ b/user/gitlab-foss/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=gitlab-foss
 _pkgname=${pkgname%-foss}
-pkgver=16.6.4
+pkgver=16.8.0
 _gittag=v$pkgver
 pkgrel=0
 pkgdesc="A version control for your server"
@@ -17,28 +17,30 @@ depends="
 	cmd:dpkg-deb
 	exiftool
 	git>=2.42.0
-	gitaly~=16.6
-	gitlab-shell~=14.30
+	gitaly~=16.8
+	gitlab-shell~=14.33
 	graphicsmagick
 	http-parser
 	procps
 	py-docutils
 	python3
 	redis>=2.8
-	ruby3.0
-	ruby3.0-bigdecimal
-	ruby3.0-bundler
-	ruby3.0-fiddle
-	ruby3.0-io-console
-	ruby3.0-irb
-	ruby3.0-json
-	ruby3.0-rake
-	ruby3.0-rdoc
-	ruby3.0-webrick
+	ruby3.2
+	ruby3.2-bigdecimal
+	ruby3.2-bundler
+	ruby3.2-fiddle
+	ruby3.2-io-console
+	ruby3.2-irb
+	ruby3.2-json
+	ruby3.2-rake
+	ruby3.2-rdoc
+	ruby3.2-webrick
 	shared-mime-info
 	tzdata
 	"
 makedepends="
+	cargo
+	clang-dev
 	cmd:chrpath
 	cmake
 	file-dev
@@ -51,13 +53,15 @@ makedepends="
 	libxml2-dev
 	libxslt-dev
 	linux-headers
+	llvm
 	nodejs
 	openssl-dev
 	protobuf-dev
 	re2-dev
-	ruby3.0-dev
-	ruby3.0-grpc~=1.58
-	ruby3.0-rugged
+	ruby3.2-dev
+	ruby3.2-grpc~=1.58
+	ruby3.2-rugged
+	rust
 	yarn>=1.2.0
 	"
 pkgusers="git"
@@ -83,7 +87,8 @@ _prefix="usr/lib/bundles/$_pkgname"
 export BUNDLE_DEPLOYMENT=true
 export BUNDLE_FORCE_RUBY_PLATFORM=true
 export BUNDLE_FROZEN=true
-export BUNDLE_JOBS=${JOBS:-2}
+# Should be tied to $JOBS, but rust native code fails to build
+export BUNDLE_JOBS=1
 
 prepare() {
 	local sysgemdir=$(ruby -e 'puts Gem.default_dir')
@@ -377,7 +382,7 @@ assets() {
 }
 
 sha512sums="
-ea6f5a6d00cc298052500617c962ddb235b4f5bc563af447e23d6af32f9e447970c4d3be0506b354802996508e8572df413a2350a603b8093f3c84f056005f55  gitlab-foss-v16.6.4.tar.gz
+90711b858345f45339e5c4e0d3a365736b053233342eadb77aa0237ab3ea1edde970cf65913c852e2c78e6e55462708850cca3764f8129750f83e8ae21c3feef  gitlab-foss-v16.8.0.tar.gz
 daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab  database-config.patch
 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b  gitlab.initd
 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a  gitlab.mailroom.initd