Skip to content

syslog-ng-cfg-helper: 1.8.0 #13

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
merged 3 commits into from
Feb 1, 2024
Merged

syslog-ng-cfg-helper: 1.8.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5561735
Fix the upgrade GitHub action
smortex Jan 31, 2024
ae1a649
Add a more readable diff in the PR description
smortex Jan 31, 2024
845cd59
syslog-ng-cfg-helper: 1.8.0
github-actions[bot] Jan 31, 2024
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
13 changes: 11 additions & 2 deletions .github/workflows/upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,20 @@ jobs:
if [ $EXISTING_PR -eq 0 ]
then
TITLE="syslog-ng-cfg-helper: $VERSION"
BODY="Generate from https://pypi.org/project/syslog-ng-cfg-helper/$VERSION"
BODY=$(mktemp)
echo "Generated from https://pypi.org/project/syslog-ng-cfg-helper/$VERSION" > $BODY
echo >> $BODY
echo 'For your convenience, here is a human-readable diff of the change:' >> $BODY
echo '```diff' >> $BODY
set +e
diff -u --label a/syntax/syslog-ng.vim <(git diff syntax/syslog-ng.vim | grep '^-syn keyword' | tr ' ' '\n' | tail -n +3) \
--label b/syntax/syslog-ng.vim <(git diff syntax/syslog-ng.vim | grep '^+syn keyword' | tr ' ' '\n' | tail -n +3) >> $BODY
set -e
echo '```' >> $BODY
git switch -c "$BRANCH"
git commit -a -s -m "$TITLE"
git push --force origin "$BRANCH"
gh pr create --title "$TITLE" --body "$BODY"
gh pr create --title "$TITLE" --body-file "$BODY"
else
echo "Pull Request already exists"
fi
Expand Down
2 changes: 1 addition & 1 deletion generate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ db = JSON.parse(File.read(ARGV[0]))
def find_keywords(hash)
keywords = []
hash.each do |key, value|
if key == 'name' && value && !value.start_with?('<')
if key == 'name' && value && value.is_a?(String) && !value.start_with?('<')
keywords << value
keywords << value.gsub('-', '_')
elsif value.is_a?(Hash)
Expand Down
Loading