Translation updates are blocked

[Nikerabbit]

Issue

Translation updates are broken (worked 3 days ago):

  [Symfony\Component\Process\Exception\ProcessFailedException]                                                                                                                                                      
  The command "cd 'mwgithub/JeroenDeDauw/Maps'; git add .; if ! git diff --cached --quiet; then git commit -m 'Localisation updates from https://translatewiki.net.'; git rebase 'origin/master' && git push origi  
  n 'master'; fi" failed.                                                                                                                                                                                           
  Exit Code: 1(General error)                                                                                                                                                                                       
  Working directory: /resources/nike                                                                                                                                                                                
  Output:                                                                                                                                                                                                           
  ================                                                                                                                                                                                                  
  [master d21ee09] Localisation updates from https://translatewiki.net.                                                                                                                                             
   4 files changed, 7 insertions(+), 3 deletions(-)                                                                                                                                                                 
  Current branch master is up to date.                                                                                                                                                                              
  Error Output:                                                                                                                                                                                                     
  ================                                                                                                                                                                                                  
  remote: error: GH006: Protected branch update failed for refs/heads/master.                                                                                                                                       
  remote: error: At least one approved review is required by reviewers with write access.                                                                                                                           
  To git@github.com:JeroenDeDauw/Maps.git                                                                                                                                                                           
   ! [remote rejected] master -> master (protected branch hook declined)                                                                                                                                            
  error: failed to push some refs to 'git@github.com:JeroenDeDauw/Maps.git' 

[JeroenDeDauw]

Ok should be fixed now

This happened since I disabled direct pushing to the master branch (by requiring pull requests). Would it be possible to have TWN synced with an i18n branch if I promise to keep it in sync? (One sync after every code change affecting messages and one sync before every release.)

[Nikerabbit]

We can read from one branch and commit to another (but that disabled our rudimentary overwrite protection... shouldn't be an issue since you will get merge conflicts when merging, I suppose).

I am not happy about this kind of solutions, but "HitGub" is killing our process. We don't have support for pull requests (let alone auto-merging them when they pass), but I guess I have to do that sooner or later.

[JeroenDeDauw]

Pull requests or reading for a different branch than the one written to are not needed here. What I had in mind is having a translatewiki branch that you interact with just the same as you did with the master branch. So all that is needed on your side is switching the branch name.

[Nikerabbit]

That is okay for now. I don't see it as good solution over long term.

[kghbln]

That is okay for now. I don't see it as good solution over long term.

I think the setup should be as easy as possible for both sides. However, translation updates are rolling in again so I guess there are currently no actionable items. Thus closing. Please re-open if I falsely assessed the status of this issue.