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

Use nlohmann_json package instead of submodule #2161

Merged
merged 2 commits into from
Feb 26, 2024

Conversation

chewi
Copy link
Contributor

@chewi chewi commented Feb 22, 2024

Description

As requested in #2148.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Copy link
Member

@ReenigneArcher ReenigneArcher left a comment

Choose a reason for hiding this comment

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

Thank you!

At first glance it looks like you updated everything except packaging/macos/Portfile

@chewi chewi force-pushed the only-system-json branch 2 times, most recently from 47b00a0 to 4a663d4 Compare February 24, 2024 10:33
@chewi
Copy link
Contributor Author

chewi commented Feb 24, 2024

Okay, fixed!

@chewi
Copy link
Contributor Author

chewi commented Feb 24, 2024

Some failures. I think I've fixed Flatpak and Windows. I don't know why MacPorts failed, the error looks unrelated.

The AppImage failed because sadly the Ubuntu 20.04 package lacks the .pc file. The 22.04 package has it, so we could bump the AppImage distro. That won't help people manually building on 20.04 though. I know you've said that 20.04 is EOL in 2030 but that is paid support. I doubt anyone is going to pay to use an old Ubuntu just to run this. Otherwise support ends in just over a year's time.

@chewi
Copy link
Contributor Author

chewi commented Feb 24, 2024

If you really wanted, I could add a generic fallback for when the .pc file isn't found.

@cgutman
Copy link
Collaborator

cgutman commented Feb 24, 2024

The AppImage failed because sadly the Ubuntu 20.04 package lacks the .pc file. The 22.04 package has it, so we could bump the AppImage distro. That won't help people manually building on 20.04 though. I know you've said that 20.04 is EOL in 2030 but that is paid support. I doubt anyone is going to pay to use an old Ubuntu just to run this. Otherwise support ends in just over a year's time.

We can't switch the AppImage to Ubuntu 22.04 yet. AppImages are bound to run on a glibc equal or greater than the version they were built against. In addition to the AppImage tooling itself preventing building with a glibc version that new, it would break commonly used distros like Debian Bullseye which ship with an older glibc than Ubuntu 22.04.

@chewi
Copy link
Contributor Author

chewi commented Feb 24, 2024

I thought AppImage might use its own glibc, but I know that's not straightforward. Steam doesn't for the same reason.

It doesn't matter though. I just realised you only use nlohmann_json on Windows. 😂

@ReenigneArcher
Copy link
Member

It doesn't matter though. I just realised you only use nlohmann_json on Windows. 😂

What? 😂

@chewi
Copy link
Contributor Author

chewi commented Feb 24, 2024

If you have any doubts, trigger the pipeline and find out. 😁

@ReenigneArcher ReenigneArcher changed the title Use system copy of nlohmann_json on all platforms Use nlohmann_json package instead of submodule Feb 26, 2024
@ReenigneArcher ReenigneArcher merged commit 11c5b64 into LizardByte:nightly Feb 26, 2024
44 checks passed
@chewi chewi deleted the only-system-json branch February 26, 2024 23:55
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants