Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
gitlab
Commits:
e554c10c by Caleb Maclennan at 2024-10-03T12:47:42+03:00
upgpkg: 17.4.1-2: Rebuild against Ruby 3.3
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = gitlab
pkgdesc = Project management and code hosting application
pkgver = 17.4.1
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.com/gitlab-org/gitlab-foss
install = gitlab.install
arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = gitlab
makedepends = node-gyp
makedepends = nodejs
makedepends = postgresql
- makedepends = ruby-rake
makedepends = rust
makedepends = yarn
depends = git
@@ -53,7 +52,6 @@ pkgbase = gitlab
backup = etc/logrotate.d/gitlab
source = git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v17.4.1
source = gitlab-configs.patch
- source =
https://gitlab.com/gitlab-org/gitlab/-/commit/6256fc51dcd67b0fa2ec21ae2b74a21175f185a4.patch
source = gitlab-environment
source = gitlab-puma.service
source = gitlab-sidekiq.service
@@ -66,7 +64,6 @@ pkgbase = gitlab
source = gitlab.logrotate
sha256sums =
e07c862a6099ca2ec60c6ff421ab623faf88c1c2e0426fe9a6e5d1b066f66e14
sha256sums =
dfbafb383942f0e6088f49c49a40c59994e1af57c6197e9443f9839e145154e3
- sha256sums =
36f747b2d51484f2c28c78d0800fc0fcb84bf5d4ad3cd72ec2c05187b1583380
sha256sums =
8cc4d933743906b4213b8ea8d8c5a62535e27e4073f73581a5dad40078dde000
sha256sums =
f99499116f5d7cf59ccb7bfabd2d1ba68fbf83040571c607f7b0b50e6f50cbcf
sha256sums =
2e5d83b3ff8166094ca35dfc58d9e591bc3127a66d9515d344753a622a22aa8a
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgname=gitlab
pkgver=17.4.1
-pkgrel=1
+pkgrel=2
pkgdesc='Project management and code hosting application'
arch=(x86_64)
url='https://gitlab.com/gitlab-org/gitlab-foss'
@@ -38,7 +38,7 @@ makedepends=(cargo
node-gyp
nodejs
postgresql
- ruby-rake
+ # ruby-rake
rust
yarn)
optdepends=('postgresql: database backend'
@@ -54,7 +54,6 @@ backup=("etc/webapps/$pkgname/database.yml"
options=(!buildflags !debug !lto)
source=("git+$url.git#tag=v$pkgver"
"$pkgname-configs.patch"
- "${url%-foss}/-/commit/6256fc51dcd67b0fa2ec21ae2b74a21175f185a4.patch"
"$pkgname-environment"
"$pkgname-puma.service"
"$pkgname-sidekiq.service"
@@ -71,7 +70,6 @@ replaces=(gitlab-workhorse)
install=gitlab.install
sha256sums=('e07c862a6099ca2ec60c6ff421ab623faf88c1c2e0426fe9a6e5d1b066f66e14'
'dfbafb383942f0e6088f49c49a40c59994e1af57c6197e9443f9839e145154e3'
- '36f747b2d51484f2c28c78d0800fc0fcb84bf5d4ad3cd72ec2c05187b1583380'
'8cc4d933743906b4213b8ea8d8c5a62535e27e4073f73581a5dad40078dde000'
'f99499116f5d7cf59ccb7bfabd2d1ba68fbf83040571c607f7b0b50e6f50cbcf'
'2e5d83b3ff8166094ca35dfc58d9e591bc3127a66d9515d344753a622a22aa8a'
@@ -96,10 +94,6 @@ prepare() {
patch -p1 -i ../$pkgname-configs.patch
- # Fix migration that uses newer Ruby syntax, fails on 3.0
- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160736
- patch -p1 -i ../6256fc51dcd67b0fa2ec21ae2b74a21175f185a4.patch
-
# '/home/git' path in the config files indicates a default path that
need to be adjusted
! grep -FqR '/home/git' config
@@ -156,7 +150,7 @@ build() {
make -C workhorse
yarn install --production --pure-lockfile
- rake -r erb -r rdoc gitlab:assets:compile RAILS_ENV=production
NODE_ENV=production USE_DB=false SKIP_STORAGE_VALIDATION=true
NODE_OPTIONS="--max_old_space_size=8192"
+ bundle exec rake -r erb -r rdoc gitlab:assets:compile
RAILS_ENV=production NODE_ENV=production USE_DB=false
SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max_old_space_size=8192"
}
package() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/commit/e554c10c94f73813b45d737df00f2d4fec3f878a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/commit/e554c10c94f73813b45d737df00f2d4fec3f878a
You're receiving this email because of your account on gitlab.archlinux.org.
