@@ -3,6 +3,9 @@ name: External Trigger Main
33on :
44  workflow_dispatch :
55
6+ permissions :
7+   contents : read 
8+ 
69jobs :
710  external-trigger-master :
811    runs-on : ubuntu-latest 
4346              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} 
4447            exit 1 
4548          fi 
46-           EXT_RELEASE =$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') 
47-           echo "External  version: \`${EXT_RELEASE }\`" >> $GITHUB_STEP_SUMMARY 
49+           EXT_RELEASE_SANITIZED =$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') 
50+           echo "Sanitized external  version: \`${EXT_RELEASE_SANITIZED }\`" >> $GITHUB_STEP_SUMMARY 
4851          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY 
4952          image="linuxserver/baseimage-fedora" 
5053          tag="42" 
@@ -100,8 +103,8 @@ jobs:
100103            exit 1 
101104          fi 
102105          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY 
103-           if [ "${EXT_RELEASE }" == "${IMAGE_VERSION}" ]; then 
104-             echo "Version  \`${EXT_RELEASE }\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY 
106+           if [ "${EXT_RELEASE_SANITIZED }" == "${IMAGE_VERSION}" ]; then 
107+             echo "Sanitized version  \`${EXT_RELEASE_SANITIZED }\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY 
105108            exit 0 
106109          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-fedora/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then 
107110            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY 
@@ -116,7 +119,7 @@ jobs:
116119                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} 
117120            else 
118121              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY 
119-               echo "New version \`${EXT_RELEASE }\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY 
122+               echo "New sanitized  version \`${EXT_RELEASE_SANITIZED }\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY 
120123              if [[ "${artifacts_found}" == "true" ]]; then 
121124                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY 
122125              fi 
@@ -136,7 +139,7 @@ jobs:
136139                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ 
137140                --data-urlencode "Submit=Submit" 
138141              echo "**** Notifying Discord ****" 
139-               TRIGGER_REASON="A version change was detected for baseimage-fedora tag 42. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE }" 
142+               TRIGGER_REASON="A version change was detected for baseimage-fedora tag 42. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED }" 
140143              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, 
141144                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], 
142145                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} 
0 commit comments