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

WIP: [3.21] backports/freecad: re-enable, upgrade to 1.0.0 #778

Draft
forge wants to merge 2 commits from freecad/upgrade-1.0.0 into v3.21
pull from: freecad/upgrade-1.0.0
merge into: forge:v3.21
Conversation 0 Commits 2 Files changed 12 +248 -1146
forge commented 2024-12-13 17:29:36 +00:00
Owner
Copy link
No description provided.
forge added 1 commit 2024-12-13 17:29:37 +00:00
backports/freecad: upgrade to 1.0.0
Some checks failed
/ lint (pull_request) Successful in 26s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 37s
Details
/ deploy-aarch64 (pull_request) Successful in 53s
Details
/ build-aarch64 (pull_request) Successful in 1m16s
Details
42bfe51a65
forge added 1 commit 2024-12-13 17:39:01 +00:00
backports/libmedc: upgrade to 1.0.0
Some checks failed
/ lint (pull_request) Successful in 28s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 47s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 1m28s
Details
64887cba21
forge force-pushed freecad/upgrade-1.0.0 from 64887cba21 to 6e776b26af 2024-12-13 17:42:27 +00:00 Compare
forge force-pushed freecad/upgrade-1.0.0 from 6e776b26af to 89cf19a889 2024-12-13 17:48:58 +00:00 Compare
forge changed title from [3.21] backports/freecad: re-enable, upgrade to 1.0.0 to WIP: [3.21] backports/freecad: re-enable, upgrade to 1.0.0 2024-12-13 18:05:00 +00:00
Some checks failed
/ lint (pull_request) Successful in 28s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 1m16s
Details
/ deploy-aarch64 (pull_request) Has been skipped
Details
/ build-aarch64 (pull_request) Failing after 3m18s
Details
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

Merge

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

   
Blocked

   
Enhancement

   
Fix

   
Maintenance

   
Needs action

   
New aport

   
Security
No labels
Backport
Blocked
Enhancement
Fix
Maintenance
Needs action
New aport
Security
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#778
No description provided.
Delete branch "freecad/upgrade-1.0.0"

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?