Mailing List Archive

Hi I fixed this.

This was caused because due to maerging from main->production the fix of
.asf.yaml was merged, too (this was caused by repairing the problems
from lucenepy with a duplicate master branch). So the production branch
was building but was deployed to Staging.

I tried to exclude asf.yaml from any merging, but there is no way to put
a "sticky" bit on it. If anybody has an idea how to tell git: never
touch asf.aml while merging, tell me!

Uwe

Am 22.11.2022 um 18:37 schrieb Adrien Grand:
> Hello,
>
> I've managed to make changes to the website for 9.4.2 and they are
> correctly reflected on lucene.staged.apache.org
> <http://lucene.staged.apache.org>. However pushing to the `production`
> branch doesn't seem to trigger a build on
> https://ci2.apache.org/#/builders/3 and I'm not seeing the production
> website getting updated either.
>
> Is someone familiar with how the build hooks with git pushes and could
> give me pointers to debug why pushes to the production branch are not
> triggering builds?
>
> --
> Adrien

--
Uwe Schindler
Achterdiek 19, D-28357 Bremen
https://www.thetaphi.de
eMail:uwe@thetaphi.de

Thanks Uwe!

On Tue, Nov 22, 2022 at 6:54 PM Uwe Schindler <uwe@thetaphi.de> wrote:

> Hi I fixed this.
>
> This was caused because due to maerging from main->production the fix of
> .asf.yaml was merged, too (this was caused by repairing the problems from
> lucenepy with a duplicate master branch). So the production branch was
> building but was deployed to Staging.
>
> I tried to exclude asf.yaml from any merging, but there is no way to put a
> "sticky" bit on it. If anybody has an idea how to tell git: never touch
> asf.aml while merging, tell me!
>
> Uwe
> Am 22.11.2022 um 18:37 schrieb Adrien Grand:
>
> Hello,
>
> I've managed to make changes to the website for 9.4.2 and they are
> correctly reflected on lucene.staged.apache.org. However pushing to the
> `production` branch doesn't seem to trigger a build on
> https://ci2.apache.org/#/builders/3 and I'm not seeing the production
> website getting updated either.
>
> Is someone familiar with how the build hooks with git pushes and could
> give me pointers to debug why pushes to the production branch are not
> triggering builds?
>
> --
> Adrien
>
> --
> Uwe Schindler
> Achterdiek 19, D-28357 Bremenhttps://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>

--
Adrien

In .gitattributes add a line
asf.yaml merge=ours

On Tue, Nov 22, 2022 at 11:54 AM Uwe Schindler <uwe@thetaphi.de> wrote:

> Hi I fixed this.
>
> This was caused because due to maerging from main->production the fix of
> .asf.yaml was merged, too (this was caused by repairing the problems from
> lucenepy with a duplicate master branch). So the production branch was
> building but was deployed to Staging.
>
> I tried to exclude asf.yaml from any merging, but there is no way to put a
> "sticky" bit on it. If anybody has an idea how to tell git: never touch
> asf.aml while merging, tell me!
>
> Uwe
> Am 22.11.2022 um 18:37 schrieb Adrien Grand:
>
> Hello,
>
> I've managed to make changes to the website for 9.4.2 and they are
> correctly reflected on lucene.staged.apache.org. However pushing to the
> `production` branch doesn't seem to trigger a build on
> https://ci2.apache.org/#/builders/3 and I'm not seeing the production
> website getting updated either.
>
> Is someone familiar with how the build hooks with git pushes and could
> give me pointers to debug why pushes to the production branch are not
> triggering builds?
>
> --
> Adrien
>
> --
> Uwe SchindlerAchterdiek 19, D-28357 Bremen <https://www.google.com/maps/search/Achterdiek+19,+D-28357+Bremen?entry=gmail&source=g>https://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>

Thanks Mike,

That's what I did long time ago (see our repo). It seems to only have an effect if there's a conflict. When it's automatic it just merges.

Uwe

Am 22. November 2022 21:16:21 MEZ schrieb Mike Drob <mdrob@mdrob.com>:
>In .gitattributes add a line
>asf.yaml merge=ours
>
>On Tue, Nov 22, 2022 at 11:54 AM Uwe Schindler <uwe@thetaphi.de> wrote:
>
>> Hi I fixed this.
>>
>> This was caused because due to maerging from main->production the fix of
>> .asf.yaml was merged, too (this was caused by repairing the problems from
>> lucenepy with a duplicate master branch). So the production branch was
>> building but was deployed to Staging.
>>
>> I tried to exclude asf.yaml from any merging, but there is no way to put a
>> "sticky" bit on it. If anybody has an idea how to tell git: never touch
>> asf.aml while merging, tell me!
>>
>> Uwe
>> Am 22.11.2022 um 18:37 schrieb Adrien Grand:
>>
>> Hello,
>>
>> I've managed to make changes to the website for 9.4.2 and they are
>> correctly reflected on lucene.staged.apache.org. However pushing to the
>> `production` branch doesn't seem to trigger a build on
>> https://ci2.apache.org/#/builders/3 and I'm not seeing the production
>> website getting updated either.
>>
>> Is someone familiar with how the build hooks with git pushes and could
>> give me pointers to debug why pushes to the production branch are not
>> triggering builds?
>>
>> --
>> Adrien
>>
>> --
>> Uwe SchindlerAchterdiek 19, D-28357 Bremen <https://www.google.com/maps/search/Achterdiek+19,+D-28357+Bremen?entry=gmail&source=g>https://www.thetaphi.de
>> eMail: uwe@thetaphi.de
>>
>>

--
Uwe Schindler
Achterdiek 19, 28357 Bremen
https://www.thetaphi.de