I see that the production and the staging are out of sync now and trying to merge the upstream production leads to a merge commit.
How do we normally handle the cases when the production branch history diverges from staging? Vlad On Thu, Jan 14, 2016 at 8:46 AM, Gunnar Morling <gun...@hibernate.org> wrote: > Davide, since Dec 21st this job is configured to run on slave4 only > (which is offline). Is there a specific reason for this or can it be > changed to run on any node again? > > 2016-01-14 3:21 GMT+01:00 Steve Ebersole <st...@hibernate.org>: > > Ok, next problem... :( > > > > http://ci.hibernate.org/view/Website/job/www.hibernate.org/ This job has > > been stuck in "pending—ci-slave-4 is offline" for hours now. > > > > > > On Wed, Jan 13, 2016 at 2:37 PM Steve Ebersole <st...@hibernate.org> > wrote: > > > >> Ok, on to the next... > >> > >> staging.hibernate.org build fails now: > >> > >> rsync error: some files/attrs were not transferred (see previous > errors) (code 23) at main.c(1165) [sender=3.1.1] > >> > >> > >> > >> On Wed, Jan 13, 2016 at 2:34 PM andrea boriero <drebor...@gmail.com> > >> wrote: > >> > >>> the problem seems related with the file name > >>> > >>> > /2016-01-12-jboss-community-asylum-hibernate-strikes-back-episode-v..erb > >>> > >>> instead of > >>> > >>> /2016-01-12-jboss-community-asylum-hibernate-strikes-back-episode-v. > >>> *html*.erb > >>> > >>> On 13 January 2016 at 20:22, Steve Ebersole <st...@hibernate.org> > wrote: > >>> > >>>> Ok, that fixed this last problem > >>>> > >>>> On Wed, Jan 13, 2016 at 2:17 PM Steve Ebersole <st...@hibernate.org> > >>>> wrote: > >>>> > >>>> > Per Hardy this might be due to a bad post uploaded to staging by > Max. > >>>> I > >>>> > just deleted that file from staging and am trying build again > >>>> > > >>>> > On Wed, Jan 13, 2016 at 1:50 PM Steve Ebersole <st...@hibernate.org > > > >>>> > wrote: > >>>> > > >>>> >> Sorry, spoke too soon... > >>>> >> > >>>> >> RROR: Running Awestruct failed. > >>>> >> /mnt/jenkins-workdir/workspace/ > staging.in.relation.to/Rakefile:104:in > >>>> `run_awestruct' > >>>> >> /mnt/jenkins-workdir/workspace/ > staging.in.relation.to/Rakefile:71:in > >>>> `block in <top (required)>' > >>>> >> Tasks: TOP => gen > >>>> >> (See full trace by running task with --trace) > >>>> >> > >>>> >> > >>>> >> > >>>> >> On Wed, Jan 13, 2016 at 1:45 PM Steve Ebersole < > st...@hibernate.org> > >>>> >> wrote: > >>>> >> > >>>> >>> Whatever you did seems to have done the trick: > >>>> >>> > http://ci.hibernate.org/view/Website/job/staging.in.relation.to/146/ > >>>> >>> > >>>> >>> Thanks > >>>> >>> > >>>> >>> > >>>> >>> On Wed, Jan 13, 2016 at 1:32 PM Sanne Grinovero < > sa...@hibernate.org > >>>> > > >>>> >>> wrote: > >>>> >>> > >>>> >>>> Could you try again now please? > >>>> >>>> > >>>> >>>> On 13 January 2016 at 19:26, Steve Ebersole <st...@hibernate.org > > > >>>> >>>> wrote: > >>>> >>>> > Trying to push and verify my announcement blog post for 5.0.7 > >>>> >>>> release, but > >>>> >>>> > Jenkins fails to build it[1]. Apparently command `rake` not > >>>> found. > >>>> >>>> > > >>>> >>>> > So what now? > >>>> >>>> > > >>>> >>>> > [1] - > >>>> >>>> > >>>> http://ci.hibernate.org/view/Website/job/staging.in.relation.to/145/ > >>>> >>>> > _______________________________________________ > >>>> >>>> > hibernate-dev mailing list > >>>> >>>> > hibernate-dev@lists.jboss.org > >>>> >>>> > https://lists.jboss.org/mailman/listinfo/hibernate-dev > >>>> >>>> > >>>> >>> > >>>> _______________________________________________ > >>>> hibernate-dev mailing list > >>>> hibernate-dev@lists.jboss.org > >>>> https://lists.jboss.org/mailman/listinfo/hibernate-dev > >>>> > >>> > >>> > > _______________________________________________ > > hibernate-dev mailing list > > hibernate-dev@lists.jboss.org > > https://lists.jboss.org/mailman/listinfo/hibernate-dev > > _______________________________________________ > hibernate-dev mailing list > hibernate-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev > _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
