PeterSurda/termux_devenv
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

WIP: A script for merging a gitea PR #1

Draft
lee.miller wants to merge 1 commits from lee.miller/termux_devenv:gitea-merge into master
pull from: lee.miller/termux_devenv:gitea-merge
merge into: PeterSurda:master
Conversation 5 Commits 1 Files Changed 1 +93
lee.miller commented 2022-04-23 01:50:56 +02:00
First-time contributor
Copy Link

Hi!

I started writing the script you asked for.

Hi! I started writing the script you asked for.
PeterSurda commented 2022-04-23 10:45:46 +02:00
Owner
Copy Link

well you don't need to put it here but I guess it works for now

well you don't need to put it here but I guess it works for now
PeterSurda approved these changes 2022-04-26 15:35:39 +02:00
PeterSurda left a comment
Owner
Copy Link

Looks ok, I'll test it out when the next PR is up for merging.

Looks ok, I'll test it out when the next PR is up for merging.
lee.miller commented 2022-04-26 21:37:28 +02:00
Author
First-time contributor
Copy Link

It is just a halfway. I also have to check approving the PR and getting the status of checks.

It is just a halfway. I also have to check approving the PR and getting the status of checks.
lee.miller commented 2022-05-19 01:45:57 +02:00
Author
First-time contributor
Copy Link

Prerequisites:

  • the github repo is supposed to be cloned by ssh url
  • arguments: <gitea username>:<gitea password> <PR no> <github username>:<github access token>
Prerequisites: - the github repo is supposed to be cloned by ssh url - arguments: `<gitea username>:<gitea password> <PR no> <github username>:<github access token>`
lee.miller force-pushed gitea-merge from 18fbf900ed to 514f6433b2 2022-05-27 03:42:31 +02:00 Compare
lee.miller commented 2022-05-27 03:59:35 +02:00
Author
First-time contributor
Copy Link

You can probably test now on somewhat like Bitmessage/PyBitmessage#4. Currently it only checks github check runs, not all required statuses.

Also I guess opening a PR on github might be done by a buildbot task, triggered by merging a PR here.

You can probably test now on somewhat like https://git.bitmessage.org/Bitmessage/PyBitmessage/pulls/4. Currently it only checks github check runs, not all required statuses. Also I guess opening a PR on github might be done by a buildbot task, triggered by merging a PR here.
PeterSurda commented 2022-07-15 02:44:32 +02:00
Owner
Copy Link

I'm now successfully using it, I store the credentials with pass, this allows them to be transparently extracted. There were also some minor changes needed (the repo I'm pushing to / calling API is not derived from my username but it's an organisation). And also some error handling is needed, sometimes the API rates are exceeded as buildbot + code quality + daily clone take a lot of API calls and github refuses to raise the limit for me, they don't even have a paid product that would allow this. But even if there is some temporary error, I can just rerun the script later without having to delete the temporary branches, and it will still work ok.

I'm now successfully using it, I store the credentials with `pass`, this allows them to be transparently extracted. There were also some minor changes needed (the repo I'm pushing to / calling API is not derived from my username but it's an organisation). And also some error handling is needed, sometimes the API rates are exceeded as buildbot + code quality + daily clone take a lot of API calls and github refuses to raise the limit for me, they don't even have a paid product that would allow this. But even if there is some temporary error, I can just rerun the script later without having to delete the temporary branches, and it will still work ok.
This pull request is marked as a work in progress.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u gitea-merge:lee.miller-gitea-merge
git checkout lee.miller-gitea-merge

Merge

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff lee.miller-gitea-merge
git checkout master
git merge --ff-only lee.miller-gitea-merge
git checkout lee.miller-gitea-merge
git rebase master
git checkout master
git merge --no-ff lee.miller-gitea-merge
git checkout master
git merge --squash lee.miller-gitea-merge
git checkout master
git merge --ff-only lee.miller-gitea-merge
git checkout master
git merge lee.miller-gitea-merge
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
PeterSurda
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: PeterSurda/termux_devenv#1
No description provided.
Delete Branch "lee.miller/termux_devenv:gitea-merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?