-
-
Notifications
You must be signed in to change notification settings - Fork 74
ci: update and fix GitHub Actions #569
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
Conversation
Thanks, I appreciate this. @matterhorn103 - should we drop #543 and rebuild on top of this pull request. |
#543 bumps Qt to 6, whereas Qt5 is remained in this PR—this can be addressed afterward. |
No, I think they should be separated actually. The really valuable stuff here is the fixes for the So I suggest that the changes to The primary goal of #543 was originally to have the CI finally match between the two repos, which I think is important for the project's overall development process, to avoid changes in one repo causing build issues in the other one. I did get a little side-tracked back in the day by taking the opportunity to update various things. I'll go and tidy up that PR now that we're post-1.100 and stick to just synchronizing the two repos, then we can merge it, the other changes I put in can come later. As such, @e-kwsm, please can you open a PR for |
Ok, #543 and OpenChemistry/avogadrolibs#2044 will bring both repos into alignment with each other. The second PR is so that the few little bits that were in app are now in libs too. |
e14d096
to
3b40734
Compare
Assuming everything builds clean, I'd like to merge this so we can move forward. Definitely a big help. |
Can't we please merge #543 and then leave out the changes to |
After #543 is merged I believe I can rebase and resolve conflicts if happened. Anyway it still fails to build AppImage. |
This is a good point. Not sure why that should be the case since the workflows are identical and in the other repo it's fine e.g. https://github.com/OpenChemistry/avogadrolibs/actions/runs/15762232716/job/44431382238. I'll have a look. |
Ok I found the issue, there was just a single line in the workflow that needed |
Okay, if one of you wants to resolve the conflicts with Thanks for the help! |
Signed-off-by: Eisuke Kawashima <[email protected]>
Signed-off-by: Eisuke Kawashima <[email protected]>
Congrats on merging your first pull request! 🎉 Thanks for making Avogadro better for everyone! |
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.