On Thu, Mar 19, 2020 at 04:27:06PM +0000, Joe Orton wrote:
> On Thu, Mar 19, 2020 at 08:32:25AM -0700, Mike Rumph wrote:
> > Build #484 fails on test #484.13, Linux Ubuntu, Regenerate ap_expr
> > +./buildconf --with-apr=/usr/bin/apr-1-config --with-regen-expr
> > unknown option --with-regen-expr
> > The command "./test/travis run_${TRAVIS_OS_NAME}.sh" exited with 1.
>
> It's something screwy with the conditional on the test, which should not
> run for 2.4.x and is described as:
>
> - if: branch != 2.4.x
> name: Linux Ubuntu, Regenerate ap_expr
>
> but this build is special because it's a tag. Could adjust those tests
> to be "if: branch = master" but then that's wrong when we branch 2.5.x.
> Not obvious how to fix it right now.
>
> Anyway, ignore the failure, everything else passed and it's good ;)
Urghh, apologies for the commit/build spam while I try to fix this.
I think the right way is probably:
if: (branch IS present AND branch != 2.4.x) OR (tag IS present AND tag !~
/^2.4)
and
if: (branch IS present AND branch = 2.4.x) OR (tag IS present AND tag =~
/^2.4)
but I did it the simpler match-against-trunk away. And of course it
should be "trunk" not "master" so r1875469 is also wrong but it's not
giving false negatives for 2.4.x.