forge/ayaports
1
0
Fork 0
Code Issues 22 Pull requests 11 Projects Releases Packages Wiki Activity Actions

backports/*: sync with aports for 3.21 release #660

Open
forge wants to merge 37 commits from backports/upgrade-3.21 into edge
pull from: backports/upgrade-3.21
merge into: forge:edge
Conversation 0 Commits 37 Files changed 74 +364 -1000
forge commented 2024-11-01 14:17:48 +00:00
Owner
Copy link
No description provided.
forge added 37 commits 2024-11-01 14:17:48 +00:00
backports/uranium: fix check
Some checks failed
/ deploy-x86_64 (pull_request) Has been cancelled
Details
/ build-x86_64 (pull_request) Has been cancelled
Details
/ deploy-aarch64 (pull_request) Has been cancelled
Details
/ build-aarch64 (pull_request) Has been cancelled
Details
/ lint (pull_request) Failing after 31s
Details
0dd3721c62
Some checks failed
/ deploy-x86_64 (pull_request) Has been cancelled
Details
/ build-x86_64 (pull_request) Has been cancelled
Details
/ deploy-aarch64 (pull_request) Has been cancelled
Details
/ build-aarch64 (pull_request) Has been cancelled
Details
/ lint (pull_request) Failing after 31s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin backports/upgrade-3.21:backports/upgrade-3.21
git checkout backports/upgrade-3.21

Merge

Merge the changes and update on Forgejo.
git checkout edge
git merge --no-ff backports/upgrade-3.21
git checkout edge
git merge --ff-only backports/upgrade-3.21
git checkout backports/upgrade-3.21
git rebase edge
git checkout edge
git merge --no-ff backports/upgrade-3.21
git checkout edge
git merge --squash backports/upgrade-3.21
git checkout edge
git merge --ff-only backports/upgrade-3.21
git checkout edge
git merge backports/upgrade-3.21
git push origin edge
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Backport

   
Enhancement

   
Fix

   
Maintenance

   
Needs action

   
New aport

   
Security

   
Upstreamed
No labels
Backport
Enhancement
Fix
Maintenance
Needs action
New aport
Security
Upstreamed
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: forge/ayaports#660
No description provided.
Delete branch "backports/upgrade-3.21"

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?