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

Automate dependency workflow further #958

Closed
CasperWA opened this issue Oct 7, 2021 · 4 comments · Fixed by #979
Closed

Automate dependency workflow further #958

CasperWA opened this issue Oct 7, 2021 · 4 comments · Fixed by #979
Assignees
Labels
CI Continuous Integration - GitHub Actions issues (NOT related to the repository Action) dependency_updates Issues pertaining to updates to our dependencies that are breaking the eager build enhancement New feature or request priority/low Issue or PR with a consensus of low priority providers_updates Updates to the Providers Repo

Comments

@CasperWA
Copy link
Member

CasperWA commented Oct 7, 2021

In Materials-Consortia/optimade-gateway I have now succeeded in developing some workflows for automating the dependency handling further, automatically activating auto-merge for the @dependabot PRs, merging them into a permanent branch that's not the default branch and then once a week create a PR from this, generating a "burner" branch that's a copy of the permanent branch.
It's necessary with this "burner" branch due to the branch being automatically deleted upon merging.
Then when this special PR is merged the permanent dependency branch will be reset to the default branch.

As a note, I think I'd avoid including the providers updates in this system, as these updates should be merged into the default branch ASAP, while the dependency updates can (in theory) wait.

@CasperWA CasperWA added enhancement New feature or request dependency_updates Issues pertaining to updates to our dependencies that are breaking the eager build priority/low Issue or PR with a consensus of low priority CI Continuous Integration - GitHub Actions issues (NOT related to the repository Action) providers_updates Updates to the Providers Repo labels Oct 7, 2021
@ml-evs
Copy link
Member

ml-evs commented Oct 7, 2021

Sounds good to me! Bear in mind we still currently have to manually update the setup.py before merging the final PRs too.

@ml-evs
Copy link
Member

ml-evs commented Oct 7, 2021

Looks like my attempts at automating really fall down if changes are made to the default branch between deps updates (also if the deps branch is not properly reset with master), so your suggestions would be very welcome...

@CasperWA
Copy link
Member Author

CasperWA commented Oct 7, 2021

Sounds good to me! Bear in mind we still currently have to manually update the setup.py before merging the final PRs too.

Right. This needs to be either automated or restructured then. We should discuss this briefly in a video call I think.

@CasperWA
Copy link
Member Author

CasperWA commented Oct 7, 2021

Looks like my attempts at automating really fall down if changes are made to the default branch between deps updates (also if the deps branch is not properly reset with master) , so your suggestions would be very welcome...

Yeah. My solution was to keep merging the default branch (master) into the permanent dependency branch for every push to the default branch. And then reset it once the single dependency PR has been merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration - GitHub Actions issues (NOT related to the repository Action) dependency_updates Issues pertaining to updates to our dependencies that are breaking the eager build enhancement New feature or request priority/low Issue or PR with a consensus of low priority providers_updates Updates to the Providers Repo
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants