Skip to content

Fix: CI error from PR descriptions due to special characters #7791

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 2 commits into from
Nov 6, 2024
Merged

Fix: CI error from PR descriptions due to special characters #7791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd16309
script: Giantnode paths fix
ShahanaFarooqui Nov 5, 2024
b4e60c3
ci: Fixed handling of special characters in PR descriptions while sea…
ShahanaFarooqui Nov 5, 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
25 changes: 13 additions & 12 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,26 @@ jobs:
git rebase origin/${{ github.base_ref }}

- name: Check changelog
env:
PR_DESCRIPTION: "${{ github.event.pull_request.body || '' }}"
EVENT_NAME: "${{ github.event_name }}"
BASE_REF: "${{ github.base_ref || 'master' }}"
run: |
EVENT_NAME="${{ github.event_name }}"
BASE_REF="${{ github.base_ref }}"
if [ -z "$BASE_REF" ]; then
BASE_REF="master"
fi
echo "Event Name: $EVENT_NAME"
echo "Base Ref: $BASE_REF"

echo "PR DESCRIPTION: $PR_DESCRIPTION"
if [ "$EVENT_NAME" = "pull_request" ]; then
PR_DESCRIPTION="$(echo '${{ github.event.pull_request.body }}')"
echo "PR Description: $PR_DESCRIPTION"
if [[ -z "$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')" && \
"$(git rev-parse --abbrev-ref HEAD)" != "$BASE_REF" && \
"$PR_DESCRIPTION" != *"Changelog-None"* ]]; then
if [[ "$PR_DESCRIPTION" != *"Changelog-None"* && \
-z "$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')" && \
"$(git rev-parse --abbrev-ref HEAD)" != "$BASE_REF" ]]; then
echo "::error::'Changelog' entry is missing in all commits, and 'Changelog-None' not specified in the PR description"
exit 1
else
echo "Changelog found."
if [[ "$PR_DESCRIPTION" == *"Changelog-None"* ]]; then
echo "Changelog found in PR description"
else
echo "Changelog found in Commit \"$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')\""
fi
fi
else
echo "Not a PR event."
Expand Down
16 changes: 6 additions & 10 deletions contrib/giantnode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,9 @@

args = parser.parse_args()

nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))

nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))
nodes = (LightningRpc('/tmp/l1/regtest/lightning-rpc'),
LightningRpc('/tmp/l2/regtest/lightning-rpc'),
LightningRpc('/tmp/l3/regtest/lightning-rpc'))

# Convenient aliases
l1 = nodes[0]
Expand All @@ -59,9 +55,9 @@
print("""
Bookkeeper is running on l1, will slow things down! Run this:

echo 'disable-plugin=bookkeeper' >> /tmp/l1-regtest/regtest/config
echo 'disable-plugin=bookkeeper' >> /tmp/l2-regtest/regtest/config
echo 'disable-plugin=bookkeeper' >> /tmp/l3-regtest/regtest/config
echo 'disable-plugin=bookkeeper' >> /tmp/l1/regtest/config
echo 'disable-plugin=bookkeeper' >> /tmp/l2/regtest/config
echo 'disable-plugin=bookkeeper' >> /tmp/l3/regtest/config
stop_ln
start_ln 3
""")
Expand Down
Loading