Skip to content

Commit

Permalink
fix(linux): pushing of updated changelog branch
Browse files Browse the repository at this point in the history
This fixes the `upload-to-debian.sh` script if the `chore/linux/changelog`
branch was created a while back while the base branch moved in the
meantime. In this case we have to use `--force` instead of
`--force-with-lease` otherwise `git` gets confused. This is save to do
since the intention is that we replace the previous commit and we know
that there is (should be) only one commit on the `chore/linux/changelog`
branch.
  • Loading branch information
ermshiperete committed Dec 10, 2024
1 parent 94025c8 commit bbf8acb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion linux/scripts/upload-to-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function push_to_github_and_create_pr() {
local PR_BODY=$4

if [[ -n "${PUSH}" ]]; then
${NOOP} git push --force-with-lease origin "${BRANCH}"
${NOOP} git push --force origin "${BRANCH}"
PR_NUMBER=$(gh pr list --draft --search "${PR_TITLE}" --base "${BASE}" --json number --jq '.[].number')
if [[ -n ${PR_NUMBER} ]]; then
builder_echo "PR #${PR_NUMBER} already exists"
Expand Down

0 comments on commit bbf8acb

Please sign in to comment.