Skip to content

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

Merged
merged 2 commits into from
Jun 21, 2025
Merged

Conversation

e-kwsm
Copy link
Contributor

@e-kwsm e-kwsm commented Jun 8, 2025

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.

@ghutchis
Copy link
Member

ghutchis commented Jun 9, 2025

Thanks, I appreciate this.

@matterhorn103 - should we drop #543 and rebuild on top of this pull request.

@e-kwsm
Copy link
Contributor Author

e-kwsm commented Jun 10, 2025

#543 bumps Qt to 6, whereas Qt5 is remained in this PR—this can be addressed afterward.

@e-kwsm e-kwsm changed the title ci: bump GitHub Action images ci: update and fix GitHub Actions Jun 10, 2025
@matterhorn103
Copy link
Collaborator

matterhorn103 commented Jun 18, 2025

@matterhorn103 - should we drop #543 and rebuild on top of this pull request.

No, I think they should be separated actually. The really valuable stuff here is the fixes for the clang-format stuff – all the changes to build_cmake.yml in this PR are to the Linux bits, which in avogadrolibs have been a) already updated and b) moved to a separate build script.

So I suggest that the changes to build_cmake.yml be taken out of this and we can merge the clang-format fixes on their own. I don't see that they need to be linked?

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 avogadrolibs with identical changes to its clang-format-check.yml? And it would be a great help by ensuring at the same time that the two files are identical (other than the different repo names of course).

@matterhorn103
Copy link
Collaborator

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.

@e-kwsm e-kwsm marked this pull request as draft June 20, 2025 11:08
@e-kwsm e-kwsm force-pushed the gha branch 3 times, most recently from e14d096 to 3b40734 Compare June 20, 2025 11:27
@ghutchis ghutchis marked this pull request as ready for review June 20, 2025 16:43
@ghutchis
Copy link
Member

Assuming everything builds clean, I'd like to merge this so we can move forward. Definitely a big help.

@matterhorn103
Copy link
Collaborator

Can't we please merge #543 and then leave out the changes to build_cmake.yml from this PR? This PR only needs to make changes to the clang stuff...

@e-kwsm
Copy link
Contributor Author

e-kwsm commented Jun 20, 2025

After #543 is merged I believe I can rebase and resolve conflicts if happened.

Anyway it still fails to build AppImage.

@matterhorn103
Copy link
Collaborator

matterhorn103 commented Jun 20, 2025

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.

@matterhorn103
Copy link
Collaborator

Ok I found the issue, there was just a single line in the workflow that needed libs changing to app, now the AppImage builds correctly. Thanks for the heads up!

@ghutchis
Copy link
Member

Okay, if one of you wants to resolve the conflicts with HEAD after merging #543 - I'd be happy to merge this too.

Thanks for the help!

e-kwsm added 2 commits June 21, 2025 13:09
Signed-off-by: Eisuke Kawashima <[email protected]>
Signed-off-by: Eisuke Kawashima <[email protected]>
Copy link
Contributor

Here are the build results
macOS.dmg
Win64.exe
Artifacts will only be retained for 90 days.

@ghutchis ghutchis merged commit 11d701f into OpenChemistry:master Jun 21, 2025
34 of 36 checks passed
Copy link

welcome bot commented Jun 21, 2025

Congrats on merging your first pull request! 🎉 Thanks for making Avogadro better for everyone!

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