From 8d4ace160fefef9ae1f1aa87857f5731f10fb94f Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 3 Jan 2023 13:51:13 -0500 Subject: [PATCH] Revert "workflows: add stamp file in openshift/os to ensure we push rebases" The underlying bug was fixed in create-pull-request 4.2.1. This reverts commit 2dfcd0f842f40d97ee16b4ba20a121e3fea17250. --- .github/workflows/openshift-os.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/openshift-os.yml b/.github/workflows/openshift-os.yml index 8b86c056..a60cbee8 100644 --- a/.github/workflows/openshift-os.yml +++ b/.github/workflows/openshift-os.yml @@ -53,14 +53,7 @@ jobs: echo "No non-trivial changes; exiting" exit 0 fi - - base=$(git rev-parse HEAD) git checkout testing-devel - # Hack: update a stamp to force create-pull-request to update the - # branch, even if we're just rebasing on a previous manual - # fedora-coreos-config sync - # https://github.com/peter-evans/create-pull-request/issues/1191 - echo $base > ../.fedora-coreos-config-base marker=OPENSHIFT-OS-END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM cat >> $GITHUB_ENV <