Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/macos legacy #6498

Merged
merged 7 commits into from
Mar 11, 2024
Merged

Feature/macos legacy #6498

merged 7 commits into from
Mar 11, 2024

Conversation

camilasan
Copy link
Member

@camilasan camilasan commented Feb 29, 2024 •
edited
Loading

Trying to build mac OS legacy versions from master.

github-actions[bot]
github-actions bot requested changes Feb 29, 2024
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/gui/systray_mac_common.mm Show resolved Hide resolved
src/gui/systray_mac_usernotifications.mm Show resolved Hide resolved
@camilasan camilasan marked this pull request as ready for review February 29, 2024 15:34
@allexzander
Copy link
Contributor

lgtm, does it compile on the build machine? I would have @claucambra here anyways for an expert look

claucambra
claucambra requested changes Mar 3, 2024
View reviewed changes
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the pbxproj changes should be reverted or amended, but everything else looks great :)

shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
@tobiasKaminsky
Copy link
Member

Can we then backport this to 3.12?

Camila and others added 7 commits March 11, 2024 09:17
@camilasan
Change minimun mac OS version to 10.13.
7f57692 
Signed-off-by: Camila <[email protected]>
@claucambra @camilasan
Create systray_mac_common file for common systray functions
ed87951 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra @camilasan
macosx: Selectively compile UserNotifications component of systray de…
3124dbe 
…pending on deployment version

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra @camilasan
Do not try to link UserNotifications framework when building below 10.14
38e22e8 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra @camilasan
Only set BUILD_FILE_PROVIDER_MODULE if deployment target high enough
b6b174a 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra @camilasan
Remove unneeded fallback for undefined cmake_osx_deployment_target
1348e8a 
Signed-off-by: Claudio Cambra <[email protected]>
@camilasan
Set min OSX version via cmake.
d86abd4 
It should now only use the CMAKE_OSX_DEPLOYMENT_TARGET set when building.

Signed-off-by: Camila Ayres <[email protected]>
@camilasan
Copy link
Member Author

/backport to stable-3.12

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6498-d86abd4275dd1375b9d146bdb244d636306e08c2-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Mar 11, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
E Maintainability Rating on New Code (required ≥ A)
6 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@camilasan camilasan merged commit 7fb8eb3 into master Mar 11, 2024
10 of 13 checks passed
@camilasan camilasan deleted the feature/macos-legacy branch March 11, 2024 14:20
@backportbot backportbot
Copy link

backportbot bot commented Mar 11, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6498/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 7f57692a ed879511 3124dbe5 38e22e85 b6b174a4 1348e8aa d86abd42

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6498/stable-3.12

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@camilasan camilasan restored the feature/macos-legacy branch March 11, 2024 14:40
@camilasan camilasan deleted the feature/macos-legacy branch March 11, 2024 14:45
@labor4
Copy link

labor4 commented Apr 22, 2024

Much love from me for this effort! Thanks

@mgallien mgallien added this to the 3.13.0 milestone Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra requested changes

@github-actions github-actions[bot] github-actions[bot] requested changes

@tobiasKaminsky tobiasKaminsky tobiasKaminsky approved these changes

@allexzander allexzander Awaiting requested review from allexzander

Assignees
No one assigned
Labels
backport-request
Projects
None yet
Milestone
3.13.0
Development

Successfully merging this pull request may close these issues.
7 participants
@camilasan @allexzander @tobiasKaminsky @nextcloud-desktop-bot @labor4 @claucambra @mgallien