Update release.yml

.github/workflows/release.yml

@@ -4,8 +4,16 @@ on:
   push:
     branches:
       - main
-      - dev
   workflow_dispatch:
+    inputs:
+      release_name:
+        description: 'Custom Release Name (e.g., "Jolly", "Christmas")'
+        required: true
+        type: string
+      release_tag:
+        description: 'Release Tag (e.g., "v1.0.0")'
+        required: true
+        type: string
 
 jobs:
   release:
@@ -30,103 +38,53 @@ jobs:
         run: bun install
         shell: bash
 
-      - name: Extract base version
-        id: extract
+      - name: Determine Release Info
+        id: release_info
         run: |
-          # Extract base version (major.minor.patch) from scripts/build.mjs using pure shell (grep/sed)
-          # This locates the first quoted semver-like string in the build script (e.g. "1.1.5-4")
-          if [ ! -f scripts/build.mjs ]; then
-            echo "scripts/build.mjs not found" >&2
-            exit 1
-          fi
-          # Print a snippet of the file for debugging in workflow logs
-          echo '--- scripts/build.mjs (snippet) ---' >&2
-          sed -n '1,200p' scripts/build.mjs >&2 || true
+          # For workflow_dispatch, use the provided inputs
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            release_name="${{ github.event.inputs.release_name }}"
+            release_tag="${{ github.event.inputs.release_tag }}"
+          else
+            # For push events, extract version and generate a name
+            if [ ! -f scripts/build.mjs ]; then
+              echo "scripts/build.mjs not found" >&2
+              exit 1
+            fi
 
-          # Primary extraction: find the first quoted semver (may include prerelease suffix)
-          raw=$(grep -m1 -oE '"[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?"' scripts/build.mjs | tr -d '"' | head -n1 || true)
+            # Extract version
+            raw=$(grep -m1 -oE '\"[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?\"' scripts/build.mjs | tr -d '\"' | head -n1 || true)
+            version=$(printf '%s' "$raw" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
 
-          # Strip any prerelease suffix, keep only major.minor.patch
-          version=$(printf '%s' "$raw" | sed -E 's/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+            if ! printf '%s' "$version" | grep -xE '^[0-9]+\.[0-9]+\.[0-9]+$' >/dev/null; then
+              echo "Failed to extract a valid base version from scripts/build.mjs" >&2
+              exit 1
+            fi
 
-          # Validate final result is exactly major.minor.patch
-          if ! printf '%s' "$version" | grep -xE '^[0-9]+\.[0-9]+\.[0-9]+$' >/dev/null; then
-            echo "Failed to extract a valid base version from scripts/build.mjs" >&2
-            sed -n '1,200p' scripts/build.mjs >&2 || true
-            exit 1
+            # Use version-based naming for push events
+            release_name="Release v${version}"
+            release_tag="v${version}"
           fi
 
-          echo "version=$version" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
+          echo "release_tag=${release_tag}" >> $GITHUB_OUTPUT
+          echo "Using release name: ${release_name}" >&2
+          echo "Using release tag: ${release_tag}" >&2
         shell: bash
 
-      - name: Prepare tag (detect dev branch and compute prerelease numeric suffix)
+      - name: Prepare tag
         id: prepare
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
 
-          # Derive branch and base version
-          ref="${GITHUB_REF#refs/heads/}"
-          version="${{ steps.extract.outputs.version }}"
-
-          echo "[debug] GITHUB_REF=$GITHUB_REF" >&2
-          echo "[debug] branch=$ref" >&2
-          echo "[debug] base version=$version" >&2
-
-          prerelease="false"
-          tag="${version}"
-
-          if [ "$ref" = "dev" ]; then
-            prerelease="true"
-
-            # Ensure we have remote tags to inspect
-            git fetch --tags --prune origin
-
-            # Collect exact-match prerelease numbers for tags that start with "<version>-"
-            # This avoids partial matches like '1.1.41' when base version is '1.1.4'
-            : > /tmp/pr_nums || true
-
-            # Use ls-remote to avoid depending on local clone tags; normalize tag names:
-            #  - strip refs/tags/
-            #  - remove annotated tag suffix ^{} if present
-            #  - remove leading v prefix
-            git ls-remote --tags origin | awk '{print $2}' \
-              | sed 's@refs/tags/@@' \
-              | sed 's/\\^{}$//' \
-              | sed 's/^v//' \
-              | while IFS= read -r tagname; do
-                  if [[ "$tagname" == "${version}-"* ]]; then
-                    num="${tagname#${version}-}"
-                    if [[ "$num" =~ ^[0-9]+$ ]]; then
-                      echo "$num" >> /tmp/pr_nums
-                    fi
-                  fi
-                done || true
-
-            echo "[debug] matching prerelease numbers:" >&2
-            cat /tmp/pr_nums 2>/dev/null || echo "(none)" >&2
-
-            max=0
-            if [ -f /tmp/pr_nums ]; then
-              while read -r n; do
-                if [ -n "$n" ] && [[ "$n" =~ ^[0-9]+$ ]]; then
-                  if [ "$n" -gt "$max" ]; then
-                    max="$n"
-                  fi
-                fi
-              done < /tmp/pr_nums || true
-            fi
-
-            next=$((max + 1))
-            tag="${version}-${next}"
-          fi
+          tag="${{ steps.release_info.outputs.release_tag }}"
 
           echo "[debug] computed tag=${tag}" >&2
 
           # Expose outputs
           echo "tag=${tag}" >> $GITHUB_OUTPUT
-          echo "prerelease=${prerelease}" >> $GITHUB_OUTPUT
 
           # Ensure a committer identity is configured for tagging (CI runners don't have one by default)
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
@@ -142,19 +100,17 @@ jobs:
           fi
         shell: bash
 
-      - name: Build (if needed)
+      - name: Build
         run: bun run build
         shell: bash
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
-          # Use the computed tag (e.g. "1.1.4" or "1.1.4-1")
-          tag_name: ${{ steps.prepare.outputs.tag }}
-          name: Release ${{ steps.prepare.outputs.tag }}
-          prerelease: ${{ steps.prepare.outputs.prerelease }}
+          tag_name: ${{ steps.release_info.outputs.release_tag }}
+          name: ${{ steps.release_info.outputs.release_name }}
           files: |
-            dist/gooncord.js
-            dist/goobcord.min.js
+            dist/goonord.js
+            dist/gooncord.min.js
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}