From 60db0a438440f935352ce341d41ebf7e6c5d39e8 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Tue, 27 Feb 2024 16:18:21 +0100 Subject: [PATCH] workflows/openshift-os : fixing up the initial checkout the base branch should be checked out initally otherwise the rebase will fails. Also fixup the log generation to remove the hard-coded testing-devel --- .github/workflows/openshift-os.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/openshift-os.yml b/.github/workflows/openshift-os.yml index 9498813dfe..10f72c6c75 100644 --- a/.github/workflows/openshift-os.yml +++ b/.github/workflows/openshift-os.yml @@ -38,6 +38,8 @@ jobs: # We need an unbroken commit chain when pushing to the fork. Don't # make assumptions about which commits are already available there. fetch-depth: 0 + # We need to checkout against the target branch + ref: ${{ github.event.inputs.target-branch }} - name: Update submodule env: @@ -58,7 +60,7 @@ jobs: cd fedora-coreos-config # Omit CoreOS Bot commits from the log message, since they generally # only affect FCOS - git shortlog "HEAD..testing-devel" --perl-regexp \ + git shortlog "HEAD..origin/$SOURCE_BRANCH" --perl-regexp \ --author='^((?!CoreOS Bot ).*)$' \ > $RUNNER_TEMP/shortlog @@ -67,7 +69,7 @@ jobs: echo "No non-trivial changes; exiting" exit 0 fi - git checkout $SOURCE_BRANCH + marker=OPENSHIFT-OS-END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM cat >> $GITHUB_ENV <