From nobody Mon Jun 05 19:30:40 2023 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 4QZkHX2GHtz4b2Q2 for ; Mon, 5 Jun 2023 19:31:20 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZkHX1gXpz3t9x for ; Mon, 5 Jun 2023 19:31:20 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685993480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=emWEuXnssAZHd9Ivxam4wUp147OavNBAH76cbCy6Uko=; b=vDmdGsP7Hp5iECHLn4NZkcMkvo+x1adoD92AWPVE39zDEy0K5dOQaFBy8F9s0H2CMjWgJK HmKlKpDiWwu2AyuWBIe4BkMJy+uIFBNSoPnbgBV+vKr1TdGqSwM0YS2WaPpv6iQoPriBG3 FEmg41txDdHE5WPO8HfLGxj2BkyrwI83orLJVyVhiDHtHr0RnVlQsmxR0AXRuOyq3qWhy8 v9HPlBoA0q1BPbAy07kBTRx1OkaIL9+6GL7ZdDk+6FjrgeOBeThOzUP0As9A0GrooUOPj/ kmSzZ/7sI8fE0eRP0mdIxPyk75l91/wGt8uOrcZrdYJaBLHyk+D6KRaB/dzMkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685993480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=emWEuXnssAZHd9Ivxam4wUp147OavNBAH76cbCy6Uko=; b=NMKwqlMxi8qsss8wTyU7uiddpL25QbNUq8Fcxnr7UhS167axXSTirBRpQ4lRt69qYbZIry QoAATk7wpdRNFGvje1zjG3bN4dU1oholbjeI/jzCRM7aRHb25VwZUr7zelHbTrrrpOa25+ iWQ1+G8l22cTpG73mYIJbXac/d6HjDWQEHXqF8uDsiOwjMHlzM3FZYT8rssv0ocN31JJU4 0gpNTYC5n7VxXYu9jf6iKE1es3bjSuE/tL1MyzuP47oAcyR2QKd5AowhTIsLjWgTp9+HV5 iD/6XpjdmBnTskMRqR45Qkh0cDiwRhVeQcTqdnbe953mlgcWSlzjZyRlUGglKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685993480; a=rsa-sha256; cv=none; b=nTc0hjc0rpJ2GXdKwhteJoVRYQrOrxvpoa+KD5pEFtUVFqP38CO1lXx/BdGQ6tF007mgij sofbUvIqGhK5W8p3+LRXIPquDFoz+JXSQ8gtI16NEY3diTFbkp1sVZnSy35n7lYUy4GWGa V54T3sg23H3hlr7SAJHMpR6lVTTHffN7l2wRCTfSqcn+mg1undyrv4gRfnZs2H3GDlj5wE ZBn8ZSviIPxPfO4SjXhCCBbkukjJNkxz5EPwGCg9JBn+t6hJdnG0FIG6mRUZrBytaNLtgG 198DZisj2OVWvgcMqRYATJyMg5w4GXgDy8zGs7Nbhz0K0v8ATSJRb36RZJhyAw== Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QZkHX0cyMzPlm for ; Mon, 5 Jun 2023 19:31:20 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-973bf581759so823295866b.0 for ; Mon, 05 Jun 2023 12:31:20 -0700 (PDT) X-Gm-Message-State: AC+VfDweDi9cqXTm0qISTuiMKsjqCnINMSxwtUqGcgrLvuAxbNFN5lFR /BJeuZOGyusOhLEr3am+CaDFm9Vv+6r1/wn4UvhLyA== X-Google-Smtp-Source: ACHHUZ5LwLbeX78RrhV2ZCm6rHLqDJlZfohMrWM4aZBRiSsY0K3fVJKmC1nAd+YlyyZVU3R+NnJBX9IB9KV2VX2hp6Q= X-Received: by 2002:a17:906:dac8:b0:966:634d:9d84 with SMTP id xi8-20020a170906dac800b00966634d9d84mr7672208ejb.20.1685993478824; Mon, 05 Jun 2023 12:31:18 -0700 (PDT) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202306051902.355J21P1079038@gitrepo.freebsd.org> In-Reply-To: <202306051902.355J21P1079038@gitrepo.freebsd.org> From: Po-Chuan Hsieh Date: Tue, 6 Jun 2023 03:30:40 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: cd3ccf540775 - main - www/gitlab-ce: Update RUN_DEPENDS To: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000066386505fd66f218" X-ThisMailContainsUnwantedMimeParts: N --00000000000066386505fd66f218 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jun 6, 2023 at 3:04=E2=80=AFAM Po-Chuan Hsieh = wrote: > The branch main has been updated by sunpoet: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3Dcd3ccf5407757430ac5899a4ba0fe= cd61992a431 > > commit cd3ccf5407757430ac5899a4ba0fecd61992a431 > Author: Po-Chuan Hsieh > AuthorDate: 2023-06-05 18:46:23 +0000 > Commit: Po-Chuan Hsieh > CommitDate: 2023-06-05 18:49:13 +0000 > > www/gitlab-ce: Update RUN_DEPENDS > > - Change RUN_DEPENDS from rubygem-aws-sdk-s3 to rubygem-aws-sdk-s3112= 2 > - Change RUN_DEPENDS from rubygem-nokogiri to rubygem-nokogiri114 > - Change RUN_DEPENDS from rubygem-rack227 to rubygem-rack22 > - Bump PORTREVISION for dependency change > --- > www/gitlab-ce/Makefile | 8 ++++---- > www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++- > Forgot to say that patch-Gemfile changes are needed for rubygem-aws-sdk-* update rubygem-aws-sdk-* changed from "aws-sdk-core ~> 3, >=3D 3.165.0" to "aws-sdk-core ~> 3, >=3D 3.174.0". This change is required to fix the following error. Resolving dependencies... Could not find compatible versions Because every version of aws-sdk-cloudformation depends on aws-sdk-core >= =3D 3.174.0, < 4.A and Gemfile depends on aws-sdk-core ~> 3.172.0, aws-sdk-cloudformation cannot be used. So, because Gemfile depends on aws-sdk-cloudformation ~> 1, version solving has failed. *** Error code 6 Stop. make: stopped in /usr/ports/www/gitlab-ce diff --git a/www/gitlab-ce/files/patch-Gemfile > b/www/gitlab-ce/files/patch-Gemfile > index c754348f488d..cf6bd0bf11c5 100644 > --- a/www/gitlab-ce/files/patch-Gemfile > +++ b/www/gitlab-ce/files/patch-Gemfile > @@ -1,4 +1,4 @@ > ---- Gemfile.orig 2023-05-18 16:48:55 UTC > +--- Gemfile.orig 2023-05-22 18:44:12 UTC > +++ Gemfile > @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3' > gem 'rugged', '~> 1.5' > @@ -38,6 +38,15 @@ > gem 'google-apis-compute_v1', '~> 0.57.0' > gem 'google-apis-container_v1', '~> 0.43.0' > gem 'google-apis-container_v1beta1', '~> 0.43.0' > +@@ -172,7 +172,7 @@ gem 'seed-fu', '~> 2.3.7' > + gem 'elasticsearch-model', '~> 7.2' > + gem 'elasticsearch-rails', '~> 7.2', require: > 'elasticsearch/rails/instrumentation' > + gem 'elasticsearch-api', '7.13.3' > +-gem 'aws-sdk-core', '~> 3.172.0' > ++gem 'aws-sdk-core', '~> 3.172' > + gem 'aws-sdk-cloudformation', '~> 1' > + gem 'aws-sdk-s3', '~> 1.122.0' > + gem 'faraday_middleware-aws-sigv4', '~>0.3.0' > @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4' > gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' > > > --00000000000066386505fd66f218 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Tue, Jun 6, 2023 at 3:04=E2=80=AFAM Po= -Chuan Hsieh <sunpoet@freebsd.org= > wrote:
The branch main has been updated by sunpoet:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3Dcd3ccf5407757430ac5899a4ba0fecd61992a431

commit cd3ccf5407757430ac5899a4ba0fecd61992a431
Author:=C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-05 18:46:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-05 18:49:13 +0000

=C2=A0 =C2=A0 www/gitlab-ce: Update RUN_DEPENDS

=C2=A0 =C2=A0 - Change RUN_DEPENDS from rubygem-aws-sdk-s3 to rubygem-aws-s= dk-s31122
=C2=A0 =C2=A0 - Change RUN_DEPENDS from rubygem-nokogiri to rubygem-nokogir= i114
=C2=A0 =C2=A0 - Change RUN_DEPENDS from rubygem-rack227 to rubygem-rack22 =C2=A0 =C2=A0 - Bump PORTREVISION for dependency change
---
=C2=A0www/gitlab-ce/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2= =A0 8 ++++----
=C2=A0www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++-

This change is required to fix the following er= ror.

Resolving dependencies...
Could not find compatible versions=

Because every version of aws-sdk-cloudformation depends on aws-sdk-= core >=3D
3.174.0, < 4.A
=C2=A0 and Gemfile depends on aws-sdk-= core ~> 3.172.0,
=C2=A0 aws-sdk-cloudformation cannot be used.
So,= because Gemfile depends on aws-sdk-cloudformation ~> 1,
=C2=A0 versi= on solving has failed.
*** Error code 6

Stop.
make: stopp= ed in /usr/ports/www/gitlab-ce

diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-= Gemfile
index c754348f488d..cf6bd0bf11c5 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig=C2=A0 =C2=A0 =C2=A0 =C2=A02023-05-18 16:48:55 UTC
+--- Gemfile.orig=C2=A0 =C2=A0 =C2=A0 =C2=A02023-05-22 18:44:12 UTC
=C2=A0+++ Gemfile
=C2=A0@@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3'
=C2=A0 gem 'rugged', '~> 1.5'
@@ -38,6 +38,15 @@
=C2=A0 gem 'google-apis-compute_v1', '~> 0.57.0'
=C2=A0 gem 'google-apis-container_v1', '~> 0.43.0'
=C2=A0 gem 'google-apis-container_v1beta1', '~> 0.43.0'<= br> +@@ -172,7 +172,7 @@ gem 'seed-fu', '~> 2.3.7'
+ gem 'elasticsearch-model', '~> 7.2'
+ gem 'elasticsearch-rails', '~> 7.2', require: 'ela= sticsearch/rails/instrumentation'
+ gem 'elasticsearch-api',=C2=A0 =C2=A0'7.13.3'
+-gem 'aws-sdk-core', '~> 3.172.0'
++gem 'aws-sdk-core', '~> 3.172'
+ gem 'aws-sdk-cloudformation', '~> 1'
+ gem 'aws-sdk-s3', '~> 1.122.0'
+ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
=C2=A0@@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4&#= 39;
=C2=A0 gem 'hangouts-chat', '~> 0.0.5', require: 'ha= ngouts_chat'


--00000000000066386505fd66f218--