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.

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

Fix macOS legacy build breakage caused by std::filesystem #6583

Merged
merged 2 commits into from
Mar 28, 2024

Conversation

claucambra
Copy link
Collaborator

std::filesystem is not supported on macOS under 10.15

@claucambra claucambra force-pushed the bugfix/macoslegacy-build-fix-stdfilesystem branch from 32e2d75 to 60dca76 Compare March 28, 2024 10:07
…cOS 10.15

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the bugfix/macoslegacy-build-fix-stdfilesystem branch from d14baf7 to 5f7d911 Compare March 28, 2024 11:11
@claucambra claucambra merged commit f13a0fc into master Mar 28, 2024
9 of 12 checks passed
@claucambra claucambra deleted the bugfix/macoslegacy-build-fix-stdfilesystem branch March 28, 2024 11:11
@claucambra
Copy link
Collaborator Author

/backport to stable-3.12

Copy link

backportbot bot commented Mar 28, 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/6583/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 7c2f4141 5f7d911e

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6583/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.

Copy link

sonarcloud bot commented Mar 28, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
31 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

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

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6583-5f7d911e324f206902d5fe27ca61ec235f1f6ef4-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.

@mgallien mgallien added this to the 3.13.0 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants