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

ci(submodule): push update to parent submodule #470

Merged
merged 7 commits into from
Jun 17, 2022

Conversation

ebaron
Copy link
Member

@ebaron ebaron commented Jun 17, 2022

Example workflow run in my fork: https://github.com/ebaron/cryostat-web/actions/runs/2516537219
Example commit from my fork: ebaron/cryostat@d7b51f7

Fixes: #469

@ebaron ebaron force-pushed the ci-push-submodule branch from 66e09c0 to be84b86 Compare June 17, 2022 20:27
@ebaron ebaron marked this pull request as ready for review June 17, 2022 20:27
@ebaron ebaron requested a review from andrewazores June 17, 2022 20:27
@ebaron ebaron added the ci label Jun 17, 2022
@ebaron
Copy link
Member Author

ebaron commented Jun 17, 2022

There's a check to ensure that the branch we're on matches the branch the submodule points to. This prevents an issue where we create a cryostat-v2.2 branch, but forget to update .gitmodules. Without this check, git submodule update --remote would pull in the latest commit from main.

Copy link
Member

@andrewazores andrewazores left a comment

Choose a reason for hiding this comment

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

Awesome, thanks

@ebaron ebaron merged commit 940b9d2 into cryostatio:main Jun 17, 2022
mergify bot pushed a commit that referenced this pull request Jun 17, 2022
* ci(submodule): push update to parent submodule

* Use remote branch with check

* tmp: use fork

* fix variables

* point git config to gitmodules

* move to own workflow, update rev-parse

* don't use fork

(cherry picked from commit 940b9d2)
ebaron added a commit that referenced this pull request Jun 20, 2022
* ci(submodule): push update to parent submodule

* Use remote branch with check

* tmp: use fork

* fix variables

* point git config to gitmodules

* move to own workflow, update rev-parse

* don't use fork

(cherry picked from commit 940b9d2)

Co-authored-by: Elliott Baron <ebaron@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

CI should update the parent submodule on push
2 participants