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

workflows: add stamp file in openshift/os to ensure we push rebases #1776

Merged
merged 1 commit into from
Jun 9, 2022
Merged

workflows: add stamp file in openshift/os to ensure we push rebases #1776

merged 1 commit into from
Jun 9, 2022

Commits on Jun 9, 2022

  1. workflows: add stamp file in openshift/os to ensure we push rebases

    The create-pull-request action currently only force-pushes branches if
    their diff has changed.  However, if we've meanwhile landed a parallel
    fedora-coreos-config update PR via a different branch, the diff might
    be the same but the base commit will be different.  We need to push the
    branch in this case too, or else the PR will be left unmergeable due to
    conflicts.  As a workaround, write the base commit ID into a stamp file
    in the root of openshift/os, so the diff will change whenever the base
    does.
    bgilbert committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    d368a3e View commit details
    Browse the repository at this point in the history