aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2024-05-21 04:12:05 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2024-05-21 08:24:51 +0000
commit4e5a9eb98da3991ee5201cca812b153d5e82ef78 (patch)
treeec37bf542a146328fa918ffe082cca5d4727cf97
parent5cb600d389dc18c7682ad4115a9ce2b79ad891ac (diff)
downloadports-4e5a9eb98da3991ee5201cca812b153d5e82ef78.tar.gz
ports-4e5a9eb98da3991ee5201cca812b153d5e82ef78.zip
www/gitlab: fix database migration error
main: -- execute("ALTER TABLE \"ci_pipelines\" DROP CONSTRAINT \"ci_pipelines_pkey\" \n") main: == [advisory_lock_connection] object_id: 52240, pg_backend_pid: 3944 rake aborted! StandardError: An error has occurred, all later migrations canceled: (StandardError) PG::DependentObjectsStillExist: ERROR: cannot drop constraint ci_pipelines_pkey on table ci_pipelines because other objects depend on it DETAIL: constraint fk_c262d728d4 on table p_ci_builds depends on index ci_pipelines_pkey HINT: Use DROP ... CASCADE to drop the dependent objects too. https://gitlab.com/gitlab-org/gitlab/-/issues/462591#top https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560
-rw-r--r--www/gitlab/Makefile7
-rw-r--r--www/gitlab/distinfo8
2 files changed, 10 insertions, 5 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index f15aacf1d9bb..2b4b3be37543 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gitlab-${FLAVOR:Uce}
PORTVERSION= 17.0.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
.endif
@@ -8,9 +9,9 @@ DISTVERSIONSUFFIX= -ee
CATEGORIES= www devel
# include patch to fix database migration
-#https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018.patch
-#PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
-#PATCHFILES+= 138018.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138018
+#https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch
+PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/
+PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560
MAINTAINER= mfechner@FreeBSD.org
COMMENT= Web GUI for managing git repositories
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index e793c208bcd9..b0bc52a92852 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,10 @@
-TIMESTAMP = 1716193221
+TIMESTAMP = 1716264608
SHA256 (gitlab-foss-v17.0.0.tar.bz2) = b4c809cf09846f3dff3c55cba6a6e6a7d16c0e790b2f2c86bf3cf89a67b7bd9f
SIZE (gitlab-foss-v17.0.0.tar.bz2) = 103670734
-TIMESTAMP = 1716193336
+SHA256 (153560.patch) = 1303cf562fac571b092395cae264544156547ad15a99a9fdac3b27e7083b2027
+SIZE (153560.patch) = 1404
+TIMESTAMP = 1716264608
SHA256 (gitlab-v17.0.0-ee.tar.bz2) = a83518a3edc711a91b9941f96365b2f869d8db411db4ee5bd5b1f27f42555672
SIZE (gitlab-v17.0.0-ee.tar.bz2) = 111194012
+SHA256 (153560.patch) = 1303cf562fac571b092395cae264544156547ad15a99a9fdac3b27e7083b2027
+SIZE (153560.patch) = 1404