babka/mastodon-babka
2
0
Fork 0
Code Issues 15 Pull requests 10 Projects Releases 4 Packages Wiki Activity Actions

Split up deployment script #50

Open
emacsen wants to merge 1 commit from pyinfra-split into babka-glitch
pull from: pyinfra-split
merge into: babka:babka-glitch
Conversation 1 Commits 1 Files changed 6 +94 -100
emacsen commented 2025-02-12 20:06:23 +00:00 (Migrated from gitlab.com)
Copy link

I've split the pyinfra deployment up and made it a little more idempotent. This code is NOT TESTED at the moment. @CSDUMMI please give it a look and test it before merging it.

I've split the pyinfra deployment up and made it a little more idempotent. This code is *NOT TESTED* at the moment. @CSDUMMI please give it a look and test it before merging it.
emacsen commented 2025-02-12 20:06:23 +00:00 (Migrated from gitlab.com)
Copy link

requested review from @CSDUMMI

requested review from @CSDUMMI
This pull request has changes conflicting with the target branch.
  • babka/deploy.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin pyinfra-split:pyinfra-split
git switch pyinfra-split

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch babka-glitch
git merge --no-ff pyinfra-split
git switch pyinfra-split
git rebase babka-glitch
git switch babka-glitch
git merge --ff-only pyinfra-split
git switch pyinfra-split
git rebase babka-glitch
git switch babka-glitch
git merge --no-ff pyinfra-split
git switch babka-glitch
git merge --squash pyinfra-split
git switch babka-glitch
git merge --ff-only pyinfra-split
git switch babka-glitch
git merge pyinfra-split
git push origin babka-glitch
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
confirmed

   
critical

   
discussion

   
documentation

   
enhancement

   
merge-upstream

   
suggestion

   
support
No labels
bug
confirmed
critical
discussion
documentation
enhancement
merge-upstream
suggestion
support
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
babka/mastodon-babka!50
No description provided.