Opened 7 months ago

Closed 7 months ago

Last modified 7 months ago

#5047 closed defect (wontfix)

Weblate webhook fail to merge repository changes pushed to main branch

Reported by: strk Owned by: robe
Priority: medium Milestone:
Component: l18n Version:
Keywords: Cc:


This is because Weblate is configured to merge changes pushed in master and not those pushed in main, and the Gitea webhook payload contains the push target, so makes a difference.

I've submitted a feature request to Weblate to support matching multiple branches:

PS: maybe we should have a l18n component…

Change History (7)

comment:1 by strk, 7 months ago

Component: documentationl18n

comment:2 by robe, 7 months ago

can we drop main :) That will solve a lot of problems.

comment:3 by strk, 7 months ago

I only know of THIS problem (do you have tickets for other problems related to main?). Anyway: sure, we can drop the main branch (just make sure it's not the *real* branch but only a reference)

comment:4 by robe, 7 months ago

I have issue with cirrus-ci that it only wants to follow main so my filter to only follow master causes it to just skip testing the master branch.

Last edited 7 months ago by robe (previous) (diff)

comment:5 by robe, 7 months ago

BTW I tend to agree with nijel on this point. I hate symrefs just causes undo annoyance everywhere like that time you went behind the scenes of weblate to create a symref. I want to get rid of main and just have a master. And if people don't like master, let us come up with something more meaningful like trunk. main annoys me on so many levels.

Either way all my bots and everything are pointing at master (some actually still say trunk in the name). So its just as huge of a pain to change to main as it is to something nicer like trunk. Trunk was a nice name on so many levels - it signifies where work happens (the trunk), it is a a nice callout to our mascot an elephant with a trunk.

the only downside is someone somewhere being offended because people get lynched on trees. Which well all I can say is lets stick with master :)

comment:6 by strk, 7 months ago

Resolution: wontfix
Status: newclosed

Ok, let's close this as wontfix. We'd better drop that "main" symreference at some point (but I won't ticket that now)

comment:7 by strk, 7 months ago

.cirrus.yml actually has:

only_if: $BRANCH != 'main'

so it should build all branches BUT main

Note: See TracTickets for help on using tickets.