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

WIP: user/rstudio-desktop: upgrade to 2023.9.1 #318

Draft
ayakael wants to merge 1 commit from rstudio/upgrade-2023.9.1 into edge
pull from: rstudio/upgrade-2023.9.1
merge into: forge:edge
Conversation 3 Commits 1 Files changed 4 +25 -61
ayakael commented 2023-11-30 02:02:40 +00:00 (Migrated from lab.ilot.io)
Copy link
No description provided.
ayakael commented 2023-12-01 01:45:31 +00:00 (Migrated from lab.ilot.io)
Copy link

marked this merge request as draft

marked this merge request as **draft**
ayakael commented 2024-04-27 01:10:18 +00:00 (Migrated from lab.ilot.io)
Copy link

rstudio now broken with boost 1.84 upgrade on edge.

rstudio now broken with boost 1.84 upgrade on edge.
ayakael commented 2024-04-27 01:10:30 +00:00 (Migrated from lab.ilot.io)
Copy link

changed title from Draft: user/rstudio-desktop: upgrade to 2023.9.1 to Draft: user/rstudio-desktop: {+fix and +}upgrade to 2023.9.1

changed title from **Draft: user/rstudio-desktop: upgrade to 2023.9.1** to **Draft: user/rstudio-desktop: {+fix and +}upgrade to 2023.9.1**
forge changed title from Draft: user/rstudio-desktop: fix and upgrade to 2023.9.1 to WIP: user/rstudio-desktop:upgrade to 2023.9.1 2024-09-03 16:20:21 +00:00
forge force-pushed rstudio/upgrade-2023.9.1 from f953b66f97 to dd27305cc3
Some checks failed
/ lint (pull_request) Successful in 28s
Details
/ deploy-aarch64 (pull_request) Successful in 51s
Details
/ build-aarch64 (pull_request) Successful in 1m10s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 5m34s
Details
2024-09-03 17:28:53 +00:00 Compare
forge changed title from WIP: user/rstudio-desktop:upgrade to 2023.9.1 to WIP: user/rstudio-desktop: upgrade to 2023.9.1 2024-09-03 17:29:00 +00:00
Some checks failed
/ lint (pull_request) Successful in 28s
Details
/ deploy-aarch64 (pull_request) Successful in 51s
Details
/ build-aarch64 (pull_request) Successful in 1m10s
Details
/ deploy-x86_64 (pull_request) Has been skipped
Details
/ build-x86_64 (pull_request) Failing after 5m34s
Details
This pull request has changes conflicting with the target branch.
  • unmaintained/rstudio-desktop/12317_support-system-yaml-cpp.patch
  • unmaintained/rstudio-desktop/cran_multithread.patch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin rstudio/upgrade-2023.9.1:rstudio/upgrade-2023.9.1
git switch rstudio/upgrade-2023.9.1

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 edge
git merge --no-ff rstudio/upgrade-2023.9.1
git switch rstudio/upgrade-2023.9.1
git rebase edge
git switch edge
git merge --ff-only rstudio/upgrade-2023.9.1
git switch rstudio/upgrade-2023.9.1
git rebase edge
git switch edge
git merge --no-ff rstudio/upgrade-2023.9.1
git switch edge
git merge --squash rstudio/upgrade-2023.9.1
git switch edge
git merge --ff-only rstudio/upgrade-2023.9.1
git switch edge
git merge rstudio/upgrade-2023.9.1
git push origin edge
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Backport

   
Blocked

   
Edge

   
Enhancement

   
Fix

   
Needs action

   
New aport

   
postmarketOS

   
Security

   
Stable

   
User
No labels
Backport
Blocked
Edge
Enhancement
Fix
Needs action
New aport
postmarketOS
Security
Stable
User
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
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
forge/ayaports!318
No description provided.