|
33 | 33 | echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
34 | 34 | echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
|
35 | 35 | skipped_branches="${skipped_branches}${br} "
|
36 |
| - elif grep -wq "^baseimage-alpine-nginx_${br}$" <<< "${SKIP_PACKAGE_TRIGGER}"; then |
| 36 | + elif grep -q "^baseimage-alpine-nginx_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then |
37 | 37 | echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
38 | 38 | echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`baseimage-alpine-nginx_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
39 | 39 | skipped_branches="${skipped_branches}${br} "
|
@@ -70,13 +70,14 @@ jobs:
|
70 | 70 | if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
|
71 | 71 | if [[ -n "${triggered_branches}" ]]; then
|
72 | 72 | NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
|
| 73 | + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-alpine-nginx/activity/ \n" |
| 74 | + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" |
73 | 75 | fi
|
74 | 76 | if [[ -n "${skipped_branches}" ]]; then
|
75 | 77 | NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
|
76 | 78 | fi
|
77 |
| - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" |
78 | 79 | echo "**** Notifying Discord ****"
|
79 | 80 | curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
80 |
| - "description": "**Package Check Build(s) Triggered for baseimage-alpine-nginx** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-alpine-nginx/activity/"' \n"}], |
| 81 | + "description": "**Package Check Build(s) for baseimage-alpine-nginx** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], |
81 | 82 | "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
82 | 83 | fi
|
0 commit comments