Skip to content

Commit

Permalink
fix on-commits.yml: invalid rebase target ?
Browse files Browse the repository at this point in the history
From https://github.com/orange-cloudfoundry/k3s-packages-boshrelease
 * branch            HEAD       -> FETCH_HEAD
Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

Successfully rebased and updated refs/heads/release-1.25.
+ git push 'https://renovate[bot]:***@github.com/orange-cloudfoundry/k3s-packages-boshrelease.git' HEAD:release-1.25
To https://github.com/orange-cloudfoundry/k3s-packages-boshrelease.git
 ! [rejected]        HEAD -> release-1.25 (non-fast-forward)
error: failed to push some refs to 'https://github.com/orange-cloudfoundry/k3s-packages-boshrelease.git'
  • Loading branch information
gberche-orange committed Jan 5, 2024
1 parent 84847ee commit 34ebffe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/on-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
# Override any existing tag with same version. This may happen if only part of the renovate PRs were merged
git tag -a -m "cutting release ${version}" ${version} -f
git pull --rebase ${remote_repo}
git pull --rebase ${remote_repo} ${GITHUB_REF_NAME}
git push ${remote_repo} HEAD:${INPUT_TARGET_BRANCH}
# Delete any existing release with same tag. Ignore push failure if no tag exists.
Expand Down

0 comments on commit 34ebffe

Please sign in to comment.