diff --git a/action.yml b/action.yml index e7b2cf2..ed511e5 100644 --- a/action.yml +++ b/action.yml @@ -19,17 +19,14 @@ runs: - name: Configure Envars shell: bash run: | - DISCORD_MESSAGE_ADDITIONAL_CONTENT="" - DISCORD_CI_ENV="${{ env.CI_NAMESPACE }}" + echo "WHAT THE?" + echo "${{ job.status }}" if [ ${{ inputs.channel }} == "deployments" ]; then echo DISCORD_WEBHOOK=${{ env.DISCORD_WEBHOOK_DEPLOYMENTS }} >> $GITHUB_ENV echo DISCORD_MESSAGE_TITLE=DEPLOY >> $GITHUB_ENV elif [ ${{ inputs.channel }} == "ci" ]; then echo DISCORD_WEBHOOK=${{ env.DISCORD_WEBHOOK_CI }} >> $GITHUB_ENV echo DISCORD_MESSAGE_TITLE=CI >> $GITHUB_ENV - echo "${DISCORD_MESSAGE_ADDITIONAL_CONTENT}\nCI Namespace: `"${DISCORD_CI_ENV}"`" - echo "CI Namespace: `"${DISCORD_CI_ENV}"`" - DISCORD_MESSAGE_ADDITIONAL_CONTENT="${DISCORD_MESSAGE_ADDITIONAL_CONTENT}\nCI Namespace: `"${DISCORD_CI_ENV}"`" else echo "Error! channel required, and must be 'ci' or 'deployments'!" exit 1 @@ -49,7 +46,7 @@ runs: # Save Common Envars echo DISCORD_MESSAGE_ACTION_URL=${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_NUMBER }} >> $GITHUB_ENV echo DISCORD_MESSAGE_REPOSITORY_URL=${{ env.GITHUB_SERVER_URL }}/${{ env.GITHUB_REPOSITORY }} >> $GITHUB_ENV - echo DISCORD_MESSAGE_ADDITIONAL_CONTENT="${DISCORD_MESSAGE_ADDITIONAL_CONTENT}\n${{ inputs.additional-content }}" >> $GITHUB_ENV + - name: Configure Kubeconfig uses: tsickert/discord-webhook@v5.4.0 with: @@ -61,5 +58,5 @@ runs: embed-color: ${{ env.DISCORD_MESSAGE_STATUS_COLOR }} content: |- **[${{ env.DISCORD_MESSAGE_TITLE }}]** | ${{ inputs.header }} | ${{ env.DISCORD_MESSAGE_STATUS_ICON }} - ${{ env.DISCORD_MESSAGE_ADDITIONAL_CONTENT }} + ${{ inputs.additional-content }}