Skip to content
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.

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

Fix bugs in role-make-version-changelog #298

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion manage-role-repos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ DEFAULT_EXCLIST=${DEFAULT_EXCLIST:-"test-harness linux-system-roles.github.io sa
sap-hana-preconfigure experimental-azure-firstboot sap-preconfigure \
auto-maintenance image_builder sap-netweaver-preconfigure ci-testing \
meta_test tox-lsr tuned .github lsr-gh-action-py26 \
ee_linux_system_roles ee_linux_automation"}
ee_linux_system_roles ee_linux_automation lsr-woke-action"}
declare -A EXARRAY
for repo in $DEFAULT_EXCLIST ${EXCLIST:-}; do
# EXARRAY is a "set" of excluded repos
Expand Down
4 changes: 2 additions & 2 deletions role-make-version-changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ else
fi
fi
if [ "$skip" = false ]; then
if [ -s "$pr_titles_file" ] && [ "${ALLOW_BAD_PRS}" = false ]; then
if [ -s "$pr_titles_file" ] && [ "${ALLOW_BAD_PRS}" = false ] && [ "${count:-0}" != 0 ]; then
echo ""
echo Verifying if all PR titles comply with the conventional commits format
: > $commitlint_errors_file
Expand Down Expand Up @@ -306,7 +306,7 @@ You have three options:
cat "$rel_notes_file" CHANGELOG.md > .tmp-changelog
fi
mv .tmp-changelog CHANGELOG.md
git show origin/docs:latest/README.html > .README.html
gh api /repos/"$owner"/"$repo"/contents/latest/README.html?ref=docs -q .content | base64 --decode > .README.html
git add CHANGELOG.md .README.html
{ echo "docs(changelog): version $new_tag [citest skip]"; echo "";
echo "Update changelog and .README.html for version $new_tag"; } > .gitcommitmsg
Expand Down