Change updater action to not commit direct to master branch

[petefoth]

Either

1. create a PR, or
2. create a new branch with the commit: we will be informed, and create the PR manually.

Either way, it's a good idea not to commit new .apks to the master branch

@petefoth
I suggest to change your "automation" to create pull requests instead of commit updates of apps directly to "master", so you can review them and avoid issues (at least for privileged apps).

Originally posted by @ale5000-git in #47

Probable fix will be in updater/git.py

[petefoth]

I have disabled commiting and pushing to master for now - see this commit: 581d2e5

What we need to do is

• create a new branch
• do any necessary commits in the new branch
• EITHER
  • create a PR to pull new branch into master
• OR
  • assume the team will be informed of a new branch, and let them do create a PR once they have made any needed further changes (e.g modify permissions files)

[petefoth]

EDIT. Couldn't make any of the below work (apart from creating a staging branch 😄 )

I'll think about this a bit more. No rush now that commiting and pushing to master is disabled

---

Having thought about this and I think the solution is as follows

1. Manually create a staging branch to accept the changes as they happen
2. Change the updater to commit to the new staging branch instead of the master branch
3. Create PRs manually to merge the changes from the staging branch to master at a time to suit us (i.e. not in the middle of the monthly build run), after we have had the chance to do at least some testing of the changes.

I'm going to try and do that now, by creating the staging branch and changing updater/git.py to

• call git checkout staging before calling git add
• call git checkout master after calling git push

The change should be tested the next time the updater runs (tomorrow afternoon) when it should pick up the 0.3.7 versions of GmsCore and FakeStore.

We can test the changes and merge them once the May build run is complete

[ale5000-git]

Wouldn't it be simpler if the python script just modify the local copy (without doing git actions at all), and then you can use an action at the end of the workflow to create a PR?
Like this action: https://github.com/marketplace/actions/create-pull-request

Then you already have the PR and it can be modified manually.

[petefoth]

Thanks. Yes that would be simpler. I'll have a look at it tomorrow.

[petefoth]

Work on this is stalled, since the microG download page is giving 409 too many attempts errors

[petefoth]

Work on this is stalled, since the microG download page is giving 409 too many attempts errors

The microG download page is back online - time to start work on this again

[petefoth]

Wouldn't it be simpler if the python script just modify the local copy (without doing git actions at all), and then you can use an action at the end of the workflow to create a PR?

Looking at the README for the create-pull-request action, it will work with both uncommitted changes to tracked files, and commits made during the workflow that have not been pushed. As our workflow may update more than one component, I think we should have a commit for each changed component. But we should not do the git push.

So our existing function add_commit_push will be modified so that it commits the changed apk for the component, but does not do the git push. The function should also be renamed to add_commit

At the end of the workflow, call the create-pull-request action create a PR containing the commits for all the changed components. We need to check that there is at least one commit to include: creating a PR containing no commits would not be good
EDIT: No - no need to check - from the README

If there are no changes (i.e. no diff exists with the checked-out base branch), no pull request will be created and the action exits silently.

[petefoth]

What changes do we need in updater.yaml

• we'll use a new branch for each run, so all updates will find themselves in a PR

- name: Create Pull Request
        uses: peter-evans/create-pull-request@v7
        with:
          commit-message: update changelog
          title: Update external apps
          body: Update the `.apk`s with the latest from F-Droid
          branch: update-changelog
          branch-suffix: timestamp
          base: main

[ale5000-git]

@petefoth
You can also automate the generation of XML files; I have written some code for this.

Workflow:
https://github.com/micro5k/microg-unofficial-installer/blob/main/.github/workflows/generate-perm-xml.yml

Scripts:
https://github.com/micro5k/microg-unofficial-installer/blob/main/tools/dl-perm-list.sh
https://github.com/micro5k/microg-unofficial-installer/blob/main/tools/generate-perm-xml.sh