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

merge conflict in dune when config-builder runs on branch #56

Open
7yl4r opened this issue Mar 1, 2024 · 0 comments
Open

merge conflict in dune when config-builder runs on branch #56

7yl4r opened this issue Mar 1, 2024 · 0 comments
Labels
bug Something isn't working

Comments

@7yl4r
Copy link
Member

7yl4r commented Mar 1, 2024

The config-build should only build the datasets.xml file for the master branch.
The builder (erroneously) ran on the dune branch once in gh actions, creating a merge conflict when trying to do the automated rebase on the server.

I have updated the action .yml file to explicitly run only on the master branch.

Leaving this issue open here for a little while in case we hit this again, but will close this once enough time has passed to regain confidence in the automated CI setup.

@7yl4r 7yl4r added the bug Something isn't working label Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant