Date: Tue, 6 Jun 2023 03:30:40 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: cd3ccf540775 - main - www/gitlab-ce: Update RUN_DEPENDS Message-ID: <CAMHz58Q7WNq4BAHVh4qJdA=fYgZMJJGpVY=GvaMZoMKSnna5Nw@mail.gmail.com> In-Reply-To: <202306051902.355J21P1079038@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Jun 6, 2023 at 3:04 AM Po-Chuan Hsieh <sunpoet@freebsd.org> wrote: > The branch main has been updated by sunpoet: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=cd3ccf5407757430ac5899a4ba0fecd61992a431 > > commit cd3ccf5407757430ac5899a4ba0fecd61992a431 > Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > AuthorDate: 2023-06-05 18:46:23 +0000 > Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > 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-s31122 > - 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, >= 3.165.0" to "aws-sdk-core ~> 3, >= 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 >= 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' > > > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr">On Tue, Jun 6, 2023 at 3:04 AM Po-Chuan Hsieh <<a href="mailto:sunpoet@freebsd.org">sunpoet@freebsd.org</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by sunpoet:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=cd3ccf5407757430ac5899a4ba0fecd61992a431" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=cd3ccf5407757430ac5899a4ba0fecd61992a431</a><br>; <br> commit cd3ccf5407757430ac5899a4ba0fecd61992a431<br> Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org><br> AuthorDate: 2023-06-05 18:46:23 +0000<br> Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org><br> CommitDate: 2023-06-05 18:49:13 +0000<br> <br> www/gitlab-ce: Update RUN_DEPENDS<br> <br> - Change RUN_DEPENDS from rubygem-aws-sdk-s3 to rubygem-aws-sdk-s31122<br> - Change RUN_DEPENDS from rubygem-nokogiri to rubygem-nokogiri114<br> - Change RUN_DEPENDS from rubygem-rack227 to rubygem-rack22<br> - Bump PORTREVISION for dependency change<br> ---<br> www/gitlab-ce/Makefile | 8 ++++----<br> www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++-<br></blockquote><div><br></div><div>Forgot to say that patch-Gemfile changes are needed for rubygem-aws-sdk-* update</div><div>rubygem-aws-sdk-* changed from "aws-sdk-core ~> 3, >= 3.165.0" to "aws-sdk-core ~> 3, >= 3.174.0".<br></div>This change is required to fix the following error.<br><br>Resolving dependencies...<br>Could not find compatible versions<br><br>Because every version of aws-sdk-cloudformation depends on aws-sdk-core >=<br>3.174.0, < 4.A<br> and Gemfile depends on aws-sdk-core ~> 3.172.0,<br> aws-sdk-cloudformation cannot be used.<br>So, because Gemfile depends on aws-sdk-cloudformation ~> 1,<br> version solving has failed.<br>*** Error code 6<br><br>Stop.<br><div>make: stopped in /usr/ports/www/gitlab-ce</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile<br> index c754348f488d..cf6bd0bf11c5 100644<br> --- a/www/gitlab-ce/files/patch-Gemfile<br> +++ b/www/gitlab-ce/files/patch-Gemfile<br> @@ -1,4 +1,4 @@<br> ---- Gemfile.orig 2023-05-18 16:48:55 UTC<br> +--- Gemfile.orig 2023-05-22 18:44:12 UTC<br> +++ Gemfile<br> @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3'<br> gem 'rugged', '~> 1.5'<br> @@ -38,6 +38,15 @@<br> gem 'google-apis-compute_v1', '~> 0.57.0'<br> gem 'google-apis-container_v1', '~> 0.43.0'<br> gem 'google-apis-container_v1beta1', '~> 0.43.0'<br> +@@ -172,7 +172,7 @@ gem 'seed-fu', '~> 2.3.7'<br> + gem 'elasticsearch-model', '~> 7.2'<br> + gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'<br> + gem 'elasticsearch-api', '7.13.3'<br> +-gem 'aws-sdk-core', '~> 3.172.0'<br> ++gem 'aws-sdk-core', '~> 3.172'<br> + gem 'aws-sdk-cloudformation', '~> 1'<br> + gem 'aws-sdk-s3', '~> 1.122.0'<br> + gem 'faraday_middleware-aws-sigv4', '~>0.3.0'<br> @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4'<br> gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'<br> <br> <br> </blockquote></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Q7WNq4BAHVh4qJdA=fYgZMJJGpVY=GvaMZoMKSnna5Nw>