-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
a2bc379
commit 60db0a4
Showing
1 changed file
with
6 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]>).*)$' \ | ||
> $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 <<EOF | ||
|
@@ -77,10 +79,10 @@ jobs: | |
EOF | ||
- name: Open pull request | ||
uses: peter-evans/create-pull-request@v4.2.3 | ||
uses: peter-evans/create-pull-request@v6.0.0 | ||
with: | ||
token: ${{ secrets.COREOSBOT_RELENG_TOKEN }} | ||
push-to-fork: coreosbot-releng/os | ||
push-to-fork: openshift/os | ||
branch: ${{ env.BRANCH_NAME }} | ||
base: ${{ env.TARGET_BRANCH }} | ||
commit-message: | | ||
|