Date: Wed, 1 Jan 2020 15:08:33 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Steve Wills <swills@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r521359 - head/www/gitlab-ce Message-ID: <CAMHz58Q0wRYiiEUSJYvbwbXN53rYcoA0aMYX0p_QhpT81x-B_A@mail.gmail.com> In-Reply-To: <50eda352-0768-2281-c717-d6f857507591@FreeBSD.org> References: <201912291258.xBTCwLwD010368@repo.freebsd.org> <08c175ed-6e70-b351-0144-b8c3f2ce4c03@FreeBSD.org> <CAMHz58QaZpbYpFHsCCUPy_FnjHvB-cihmExSoF0mh6ZmRf-5cw@mail.gmail.com> <50eda352-0768-2281-c717-d6f857507591@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Dec 31, 2019 at 10:03 PM Steve Wills <swills@freebsd.org> wrote:
> Hi,
>
> On 12/31/19 6:20 AM, Po-Chuan Hsieh wrote:
> > Hi Steve,
> >
> > Thanks for pointing that out.
> > But adding rubygem-sidekiq5-cron breaks current naming rule for rubygem
> > ports.
>
> I disagree. "rubygem-sidekiq-cron5" would be a confusing name. Perhaps
> "rubygem-sidekiq-cron-sidekiq5" but that seems unnecessary.
>
Of course not rubygem-sidekiq-cron5. It would looks like
rubygem-sidekiq-cron 5.x.
I just want to say that we do not have something like this before.
PORTNAME=sidekiq5-cron
DISTNAME=sidekiq-cron-${PORTVERSION}
> > We have other 2 options:
> > - Remove or rename bin/sidekiq executables from rubygem-sidekiq5
> > - Change rubygem-sidekiq-cron to use rubygem-sidekiq5
> >
> > I would choose the latter. What do you think?
>
> Again, I disagree. I think it is better to rename sidekiq executable, it
> makes sense to me that rubygem-sidekiq5 contains "sidekiq5" script.
>
If you're sure that gitlab-ce does not use bin/sidekiq, I'm fine with your
patch in the following mail. Thanks!
> Steve
>
> > Regards,
> > sunpoet
> >
> > On Tue, Dec 31, 2019 at 11:05 AM Steve Wills <swills@freebsd.org
> > <mailto:swills@freebsd.org>> wrote:
> >
> > Hi,
> >
> > GitLab package now fails to build because rubygem-sidekiq-cron
> depends
> > on rubygem-sidekiq-6.0.4, which conflicts with rubygem-sidekiq5-5.2.7
> > because they both install /usr/local/bin/sidekiq. I guess we need a
> > rubygem-sidekiq5-cron package.
> >
> > Steve
> >
> > On 12/29/19 7:58 AM, Sunpoet Po-Chuan Hsieh wrote:
> > > Author: sunpoet
> > > Date: Sun Dec 29 12:58:21 2019
> > > New Revision: 521359
> > > URL: https://svnweb.freebsd.org/changeset/ports/521359
> > >
> > > Log:
> > > Change RUN_DEPENDS from rubygem-sidekiq to rubygem-sidekiq5
> > >
> > > - Bump PORTREVISION for dependency change
> > >
> > > Modified:
> > > head/www/gitlab-ce/Makefile
> > >
> > > Modified: head/www/gitlab-ce/Makefile
> > >
> >
> ==============================================================================
> > > --- head/www/gitlab-ce/Makefile Sun Dec 29 12:58:16 2019
> > (r521358)
> > > +++ head/www/gitlab-ce/Makefile Sun Dec 29 12:58:21 2019
> > (r521359)
> > > @@ -3,7 +3,7 @@
> > >
> > > PORTNAME= gitlab-ce
> > > PORTVERSION= 12.6.1
> > > -PORTREVISION= 0
> > > +PORTREVISION= 1
> > > CATEGORIES= www devel
> > >
> > > MAINTAINER= mfechner@FreeBSD.org
> > > @@ -126,7 +126,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
> > > rubygem-rack-timeout>=0:www/rubygem-rack-timeout \
> > >
> >
> rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord
> \
> > >
> >
> rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \
> > > - rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \
> > > + rubygem-sidekiq5>=5.2.7<5.3.0:devel/rubygem-sidekiq5 \
> > > rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
> > >
> >
> rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \
> > >
> >
> rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \
> > >
> >
>
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Q0wRYiiEUSJYvbwbXN53rYcoA0aMYX0p_QhpT81x-B_A>