diff --git a/.github/actions/discord-webhook/action.yml b/.github/actions/discord-webhook/action.yml index 0a2ea7e..bf9bfde 100644 --- a/.github/actions/discord-webhook/action.yml +++ b/.github/actions/discord-webhook/action.yml @@ -26,10 +26,12 @@ runs: - name: Send Discord notification shell: bash run: | + MESSAGE='${{ inputs.message }}' + if [ -n "${{ inputs.color }}" ]; then # Send as embed with color PAYLOAD=$(jq -n \ - --arg content "${{ inputs.message }}" \ + --arg content "$MESSAGE" \ --arg username "${{ inputs.username }}" \ --arg avatar "${{ inputs.avatar_url }}" \ --arg color "${{ inputs.color }}" \ @@ -42,7 +44,7 @@ runs: else # Send as simple message PAYLOAD=$(jq -n \ - --arg content "${{ inputs.message }}" \ + --arg content "$MESSAGE" \ --arg username "${{ inputs.username }}" \ --arg avatar "${{ inputs.avatar_url }}" \ '{ diff --git a/.github/workflows/steam_alpha.yml b/.github/workflows/steam_alpha.yml index 334c2b4..b00dfdf 100644 --- a/.github/workflows/steam_alpha.yml +++ b/.github/workflows/steam_alpha.yml @@ -83,7 +83,7 @@ jobs: id: vars run: | echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT - name: Discord notification uses: ./.github/actions/discord-webhook @@ -165,7 +165,7 @@ jobs: id: vars run: | echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT - name: Discord notification uses: ./.github/actions/discord-webhook @@ -221,7 +221,7 @@ jobs: id: vars run: | echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT - name: Discord notification uses: ./.github/actions/discord-webhook