@@ -107,7 +107,7 @@ jobs:
107107 "username": "Github Actions"}' ${{ '{{' }} secrets.DISCORD_WEBHOOK {{ '}}' }}
108108 exit 1
109109 fi
110- EXT_RELEASE =$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
110+ EXT_RELEASE_SANITIZED =$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
111111 echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
112112 echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
113113 image="{{ better_vars.LS_USER }}/{{ project_name }}"
@@ -164,7 +164,7 @@ jobs:
164164 exit 1
165165 fi
166166 echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
167- if [ "${EXT_RELEASE }" == "${IMAGE_VERSION}" ]; then
167+ if [ "${EXT_RELEASE_SANITIZED }" == "${IMAGE_VERSION}" ]; then
168168 echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
169169 exit 0
170170{% if external_type == "alpine_repo" and better_vars .MULTIARCH == 'true' %}
@@ -197,7 +197,7 @@ jobs:
197197 "username": "Github Actions"}' ${{ '{{' }} secrets.DISCORD_WEBHOOK {{ '}}' }}
198198 else
199199 printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
200- echo "New version \`${EXT_RELEASE }\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
200+ echo "New sanitized version \`${EXT_RELEASE_SANITIZED }\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
201201 if [[ "${artifacts_found}" == "true" ]]; then
202202 echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
203203 fi
@@ -217,7 +217,7 @@ jobs:
217217 --data-urlencode "description=GHA external trigger https://github.com/${{ '{{' }} github.repository {{ '}}' }}/actions/runs/${{ '{{' }} github.run_id {{ '}}' }}" \
218218 --data-urlencode "Submit=Submit"
219219 echo "**** Notifying Discord ****"
220- TRIGGER_REASON="A version change was detected for {{ project_name }} tag {{ release_tag }}. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE }"
220+ TRIGGER_REASON="A version change was detected for {{ project_name }} tag {{ release_tag }}. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED }"
221221 curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
222222 "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
223223 "username": "Github Actions"}' ${{ '{{' }} secrets.DISCORD_WEBHOOK {{ '}}' }}
0 commit comments