Skip to content

Fixes #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
basak-qcom merged 4 commits into from
Jan 15, 2026
Merged

Fixes #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72a9342
promote wf: modify changelog commit message
simonbeaudoin0935 Jan 14, 2026
32a867e
scripts: fix typo in error message
basak-qcom Jan 15, 2026
a1a3a3b
scripts: adjust merge commit message
basak-qcom Jan 15, 2026
9bf1628
Promotion wf: adjust new upstream changelog entry
basak-qcom Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/qcom-promote-upstream-reusable-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ jobs:
export DEBEMAIL="${{vars.DEB_PKG_BOT_CI_EMAIL}}"

# use ignore branch because we are not on default debian branch
gbp dch \
--ignore-branch \
dch \
--distribution=UNRELEASED \
--new-version=${{env.NORMALIZED_VERSION}}-1
--newversion=${{env.NORMALIZED_VERSION}}-1 \
'New upstream release'

git commit -a -s -m "Update changelog for ${{env.NORMALIZED_VERSION}}-1 release"
git commit -a -s -m "Update changelog version to ${{env.NORMALIZED_VERSION}}-1 and UNRELEASED suite"

- name: Push Upstream/latest and debian PR Branch
run: |
Expand Down
19 changes: 13 additions & 6 deletions scripts/merge_debian_packaging_upstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -e
upstream="$1"

if ! debian_ref="$(git symbolic-ref HEAD)"; then
echo "Function requires the Debian packaging branche to be checked out" >&2
echo "Function requires the Debian packaging branch to be checked out" >&2
echo "Are you in a detached HEAD state?" >&2
exit 1
fi
Expand All @@ -40,15 +40,22 @@ git checkout "$upstream"
git reset "$debian_ref" -- :/:debian :/:.github
tree=$(git write-tree)

merge_commit_header="Merge upstream tag '$upstream' into Debian packaging branch '$debian_branch'"
merge_commit_header="Merge '$upstream' into Debian packaging branch '$debian_branch'"

merge_commit_body=$(cat <<EOF
This commit pulls in upstream changes from tag '$upstream' into the Debian packaging branch.
This commit pulls in upstream changes from '$upstream' into the
Debian packaging branch.

Since upstream project might have content of their own in their .github/ folder (because they have CI stuff on their side),
it's important to NOT pick up .github/ folder from upstream, and only leave the .github/ folder from debian packaging branch.
Since upstream project might have content of their own in their .github/
folder (because they have CI stuff on their side), it's important to NOT
pick up .github/ folder from upstream, and only leave the .github/
folder from debian packaging branch.

The same applies to debian/ folder if upstream has one (which is rare but possible).
The same applies to debian/ folder if upstream has one (which is rare
but possible).

This commit was generated automatically by
qcom-build-utils/scripts/merge_debian_packaging_upstream.
EOF
)

Expand Down
Loading