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

deps: use upstream qtkeychain #5697

Merged
merged 5 commits into from
Nov 5, 2024

Conversation

Nerixyz
Copy link
Contributor

@Nerixyz Nerixyz commented Nov 5, 2024

Nothing requires us to use the forked version, so let's use the upstream version. That one has too many warnings on clang-cl but that's not a compiler we officially support.

Copy link
Member

@pajlada pajlada left a comment

Choose a reason for hiding this comment

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

Swap to our forks' master branch instead, and next release we can swap repo url

@Nerixyz
Copy link
Contributor Author

Nerixyz commented Nov 5, 2024

Swap to our forks' master branch instead, and next release we can swap repo url

...why? Both branches are at the same commit. If we use the upstream version, we get updates through dependabot (assuming it's not disabled).

@pajlada
Copy link
Member

pajlada commented Nov 5, 2024

Swap to our forks' master branch instead, and next release we can swap repo url

...why? Both branches are at the same commit. If we use the upstream version, we get updates through dependabot (assuming it's not disabled).

Changing remote throws off build systems that don't use git submodules directly, instead relying on user-input submodules. If possible I like to make those changes together with, or after, a release

@Nerixyz
Copy link
Contributor Author

Nerixyz commented Nov 5, 2024

Changing remote throws off build systems that don't use git submodules directly, instead relying on user-input submodules. If possible I like to make those changes together with, or after, a release

How would that be different when using the fork versus the upstream version? If the author has to update submodules manually, they'd need to specify the new commit either way.

This really shows how bad submodules are for dependencies.

@pajlada pajlada merged commit f3a5f81 into Chatterino:master Nov 5, 2024
18 checks passed
@Nerixyz Nerixyz deleted the deps/upstream-qtkeychain branch November 5, 2024 21:13
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.

2 participants