More Workflow Fixes ig

Author: ryderjt

.github/workflows/release-to-discord.yml

@@ -4,6 +4,16 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      release_tag:
+        description: "Release tag to announce when running manually (e.g. 1.0.2). Leave blank to use the selected ref name."
+        required: false
+        type: string
+      mention_here:
+        description: "Ping @here"
+        required: false
+        type: boolean
+        default: true
 
 jobs:
   build-and-post:
@@ -30,24 +40,49 @@ jobs:
           curl --fail -L -o libs/baritone-api-fabric-1.15.0.jar \
             https://github.com/cabaletta/baritone/releases/download/v1.15.0/baritone-api-fabric-1.15.0.jar
           ls -l libs/baritone-api-fabric-1.15.0.jar
-        
+
       - name: Build
         env:
           BARITONE_API_JAR: libs/baritone-api-fabric-1.15.0.jar
         run: |
-          if [ ! -f libs/baritone-api-fabric-1.15.0.jar ]; then
-            echo "Baritone API jar missing; listing libs:"
-            ls -l libs || true
-            exit 1
-          fi
+          set -euo pipefail
+          test -f libs/baritone-api-fabric-1.15.0.jar
           ./gradlew build -PbaritoneApiPath=libs/baritone-api-fabric-1.15.0.jar
 
       - name: Post to Discord (message + all jar attachments)
         shell: bash
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          INPUT_RELEASE_TAG: ${{ inputs.release_tag }}
+          INPUT_MENTION_HERE: ${{ inputs.mention_here }}
         run: |
+          set -euo pipefail
+
+          NAME="${{ github.event.repository.name }}"
+
+          # Prefer real release payload when triggered by a published release
           TAG="${{ github.event.release.tag_name }}"
           URL="${{ github.event.release.html_url }}"
-          NAME="${{ github.event.repository.name }}"
+
+          # If manual run, use provided input or the selected ref name
+          if [ -z "${TAG}" ] || [ "${TAG}" = "null" ]; then
+            if [ -n "${INPUT_RELEASE_TAG}" ]; then
+              TAG="${INPUT_RELEASE_TAG}"
+            else
+              TAG="${GITHUB_REF_NAME}"
+            fi
+          fi
+
+          # Build a URL if the release payload isn't present (manual runs)
+          if [ -z "${URL}" ] || [ "${URL}" = "null" ]; then
+            URL="https://github.com/${GITHUB_REPOSITORY}/releases/tag/${TAG}"
+          fi
+
+          # Mention line (optional)
+          MENTION=""
+          if [ "${INPUT_MENTION_HERE}" = "true" ]; then
+            MENTION='@here\n'
+          fi
 
           # Collect all "main" jars (ignore common extra jars)
           mapfile -t JARS < <(ls -1 build/libs/*.jar 2>/dev/null \
@@ -64,11 +99,12 @@ jobs:
           i=1
           for jar in "${JARS[@]}"; do
             echo "Attaching: $jar"
-            CURL_FILES+=(-F "file${i}=@\"${jar}\"")
+            CURL_FILES+=(-F "file${i}=@${jar}")
             i=$((i+1))
           done
 
+          # Send message + attachments
           curl \
-            -F "payload_json={\"content\":\"@here\\n**${NAME} ${TAG}**\\nGitHub Release: ${URL}\\n\\n**Downloads:** (files attached)\"}" \
+            -F "payload_json={\"content\":\"${MENTION}**${NAME} ${TAG}**\nGitHub Release: ${URL}\n\nDownloads: (files attached)\"}" \
             "${CURL_FILES[@]}" \
-            "${{ secrets.DISCORD_WEBHOOK_URL }}"
+            "${DISCORD_WEBHOOK_URL}"