mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-09-22 17:44:00 +02:00
Address review feedback: fail loudly on real fetch/diff errors, fix multiline output
- Stop masking git fetch/diff failures with a blanket `|| true`. That swallowed real errors (bad ref, network failure) into an empty changed_addons result, the same silent-skip failure mode this PR exists to fix. Capture the diff separately from the grep filter so `|| true` only covers grep's expected "no match" exit code, while fetch/diff failures now abort the job via the runner's default `set -eo pipefail`. - Write changelogs_files using the GITHUB_OUTPUT multiline delimiter syntax instead of a plain `key=value` echo. A PR touching more than one addon's CHANGELOG.md produced a value with embedded newlines, which corrupts the output file under the single-line format. Addresses review comments from coderabbitai and chatgpt-codex-connector on PR #2887.
This commit is contained in:
18
.github/workflows/onpr_check-pr.yaml
vendored
18
.github/workflows/onpr_check-pr.yaml
vendored
@@ -22,8 +22,9 @@ jobs:
|
||||
- name: Find changed addon directories
|
||||
id: find_addons
|
||||
run: |
|
||||
git fetch origin "${{ github.event.pull_request.base.sha }}" || true
|
||||
changed_config_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" | grep -E '^[^/]+/config\.(json|ya?ml)$' || true)
|
||||
git fetch origin "${{ github.event.pull_request.base.sha }}"
|
||||
diff_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}")
|
||||
changed_config_files=$(printf '%s\n' "$diff_files" | grep -E '^[^/]+/config\.(json|ya?ml)$' || true)
|
||||
echo "Changed config files:"
|
||||
echo "$changed_config_files"
|
||||
changed_addons=$(printf '%s' "$changed_config_files" | awk -F/ '{print $1}' | sort -u | jq -R -s -c 'split("\n") | map(select(length > 0))')
|
||||
@@ -32,11 +33,16 @@ jobs:
|
||||
- name: Find changelog
|
||||
id: changed-files
|
||||
run: |
|
||||
git fetch origin "${{ github.event.pull_request.base.sha }}" || true
|
||||
changed_changelog_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" | grep -iE '^([^/]+/)?changelog\.(md|txt|ya?ml|json)$' || true)
|
||||
git fetch origin "${{ github.event.pull_request.base.sha }}"
|
||||
diff_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}")
|
||||
changed_changelog_files=$(printf '%s\n' "$diff_files" | grep -iE '^([^/]+/)?changelog\.(md|txt|ya?ml|json)$' || true)
|
||||
echo "$changed_changelog_files"
|
||||
echo "changelogs_files=$changed_changelog_files" >> "$GITHUB_OUTPUT"
|
||||
changed_config_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" | grep -E '^[^/]+/config\.(json|ya?ml)$' || true)
|
||||
{
|
||||
echo "changelogs_files<<EOF_CHANGELOG_FILES"
|
||||
echo "$changed_changelog_files"
|
||||
echo "EOF_CHANGELOG_FILES"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
changed_config_files=$(printf '%s\n' "$diff_files" | grep -E '^[^/]+/config\.(json|ya?ml)$' || true)
|
||||
echo "$changed_config_files"
|
||||
all_changed_files=$(echo -e "$changed_config_files\n$changed_changelog_files" | sort -u)
|
||||
changed_addons=$(printf '%s' "$all_changed_files" | awk -F/ '{print $1}' | sort -u | jq -R -s -c 'split("\n") | map(select(length > 0))')
|
||||
|
||||
Reference in New Issue
Block a user