From nobody Tue May 21 08:25:35 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vk6vN01hbz5LgbG; Tue, 21 May 2024 08:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vk6vM45dqz4fS3; Tue, 21 May 2024 08:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716279935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xAhln6O4+ldkqhYjYuT4DWzPxCJvL5TrFjiJOc0ono=; b=K7afwNloUqfrssqQfusMeLZSswmTx4dssdkwvqD6BA6Mba3xmZCr+zIiipydtLKmUUkFXV YNqmDgsqP5okTzEETpHZ+a5+cwYmKvlYpRNkvGJSLpWXSXBiLrwF5vXOL1F14yMxKYJlcq fwLq8flmhqMmHoXgDUKSECxTBc6n4nPpWpys1PRusD/h4XH5i+PcJ+SRaejvuf/1ynsdgv FnfVD+q8er6QS5FphCwG3no2LZhht+3jPRxAi8CcYCB9Ty6SZVErZAGYjAlogqptCvSkby jPrbiIvMjQPqd4Y0r8XPjqo7KGKlppz6kB78olA1Q+bQFF/HGvv5t5YdZWqMDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716279935; a=rsa-sha256; cv=none; b=DgeHKqGOjHXiVIbcsas2jLzCnkxLdw8iuz/g4Zoa5ivOkz9YpaxS0Rl4nuYCnJp128XqsL tfv8eGrUuUtNKwpQ4QxTygQV1pCqb7yq56FyzX8S8G5A0CuQj81KUyLPUtt8QmQhZ54DTE +m2FJcHlCppCzyU+HOQMqJTvbTQ7Rrepcwg02UD1fvw6SeLs19llWWL8JLhCriL4i4mDnf 7ath08dOPfET0K4a0YhidGVZZI6xRVqngK31KiAgZ7/SbEWqQYF/f3t3IesxnW7p65uxPy uFX+Gpl+xgh/pwPb3aCjQBeaTZ+yI+KEfiLPi4g31OtEwhcTGrHCNAR/j9lbqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716279935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xAhln6O4+ldkqhYjYuT4DWzPxCJvL5TrFjiJOc0ono=; b=i8ebm/A3X4Pg7q69TIbpMGAJ8lFVzkCSUuBWXNnfwcsJRhyBU7G+Oe8bsYwkQKgDDV/ExO BVyBj/67T/E+LVxIe/gldmxyjQQJXQylRWxGWHrljto1SzGVoaH4ST6CiE9xdUnRROium1 zaU5lezzua3si7ogD7fnuIP0ygn3wMdOyhUkxkFt6zDasghmORL9eTujlgaO/Hm2TWOv6j BjTPqiCm52FjMTXAjx6G9ylIaQrtzrdMXcGfuKbkxsF9wgLbiwdZ+w0guWd0KV2DitofXc E8ZE9OkOVUVE9aJ86Pd7shU4/rREWqhoVegHpvYyyzTlKCivHKrnodoGSguDZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vk6vM3hqzzFSZ; Tue, 21 May 2024 08:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44L8PZYp058574; Tue, 21 May 2024 08:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44L8PZ81058571; Tue, 21 May 2024 08:25:35 GMT (envelope-from git) Date: Tue, 21 May 2024 08:25:35 GMT Message-Id: <202405210825.44L8PZ81058571@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 4e5a9eb98da3 - main - www/gitlab: fix database migration error List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e5a9eb98da3991ee5201cca812b153d5e82ef78 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e5a9eb98da3991ee5201cca812b153d5e82ef78 commit 4e5a9eb98da3991ee5201cca812b153d5e82ef78 Author: Matthias Fechner AuthorDate: 2024-05-21 04:12:05 +0000 Commit: Matthias Fechner CommitDate: 2024-05-21 08:24:51 +0000 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 --- www/gitlab/Makefile | 7 ++++--- www/gitlab/distinfo | 8 ++++++-- 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