Skip to content

Commit d6ebe44

Browse files
committed
Improve changelog-verification yml
1 parent b269163 commit d6ebe44

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

.github/workflows/changelog-verification.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,27 @@ jobs:
1919
if: ${{ !contains(github.event.pull_request.labels.*.name, 'changelog-not-required') }}
2020
run: |
2121
git fetch origin ${{ github.base_ref }} --depth 1
22-
NON_TEST_FILES=$( git diff remotes/origin/${{ github.base_ref }} --name-only | grep "\.java$" | grep -v -E "(^|/)(test|it)/" || true)
23-
if [ -n "NON_TEST_FILES" ]; then
24-
echo "::error::Non-test Java change found:"
25-
echo "NON_TEST_FILES" | while read file; do
26-
echo "::error::$file"
22+
NON_TEST_FILES=$(git diff remotes/origin/${{ github.base_ref }} --name-only | grep "\.java$" | grep -v -E "(^|/)(test|it)/" || true)
23+
if [ -n "$NON_TEST_FILES" ]; then
24+
echo "::notice::Non-test Java changes found:"
25+
echo "$NON_TEST_FILES" | while read file; do
26+
echo "::notice::$file"
2727
done
28-
git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/next-release/*[a-zA-Z0-9_-]+\.json"
28+
echo "Checking for changelog entry..."
29+
CHANGELOG_FILES=$(git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/next-release/.*[a-zA-Z0-9_-]+\.json" || true)
30+
if [ -z "$CHANGELOG_FILES" ]; then
31+
echo "::error::No changelog entry found for Java changes"
32+
exit 1
33+
else
34+
echo "::notice::Changelog entry found: $CHANGELOG_FILES"
35+
fi
2936
else
30-
echo "No change that may require a changelog entry found."
37+
echo "::notice::No non-test Java changes found. Changelog verification skipped."
3138
fi
3239
- name: Error message
3340
if: ${{ failure() }}
3441
run: |
35-
echo "::error ::No new/updated changelog entry found in /.changes/next-release directory. Please either:"
36-
echo "::error ::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
37-
echo "::error ::* Add the 'changelog-not-required' label to this PR (in rare cases not warranting a changelog entry)"
42+
echo "::error::No new/updated changelog entry found in /.changes/next-release directory. Please either:"
43+
echo "::error::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
44+
echo "::error::* Add the 'changelog-not-required' label to this PR (in rare cases not warranting a changelog entry)"
3845
exit 1

0 commit comments

Comments
 (0)