update workflow

Author: gate-guardian

.github/scripts/meta.sh

@@ -2,12 +2,19 @@
 
 set -euo pipefail
 
+name="$(tomlq -r '.name' < pack.toml)"
+slug="$(printf '%s' "$name" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g')"
 version="$(tomlq -r '.version' < pack.toml)"
-slug="$(tomlq -r '.name' < pack.toml | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g')"
 minecraft_version="$(tomlq -r '.versions.minecraft' < pack.toml)"
 forge_version="$(tomlq -r '.versions.forge' < pack.toml)"
+short_sha="${GITHUB_SHA::7}"
+
+{
+    echo "NAME=$name"
+    echo "SLUG=$slug"
+    echo "VERSION=$version"
+    echo "MINECRAFT_VERSION=$minecraft_version"
+    echo "FORGE_VERSION=$forge_version"
+    echo "SHORT_SHA"="$short_sha"
+} >> "$GITHUB_ENV"
 
-echo "VERSION=$version" >> "$GITHUB_ENV"
-echo "SLUG=$slug" >> "$GITHUB_ENV"
-echo "MINECRAFT_VERSION=$minecraft_version" >> "$GITHUB_ENV"
-echo "FORGE_VERSION=$forge_version" >> "$GITHUB_ENV"

.github/workflows/nightly.yml

@@ -2,6 +2,9 @@ name: Nightly Modpack Build
 
 on:
   push:
+    branches:
+      - 'main'
+      - 'workflow'
 
 env:
   MANIFEST_REPO: GregTechLite/gregtechlite.github.io
@@ -48,13 +51,6 @@ jobs:
         id: package_server
         run: bash .github/scripts/server.sh "${SLUG}-nightly" "${MANIFEST_BASE_URL}/nightly/pack.toml"
 
-      - name: Prepare nightly metadata
-        id: nightly_meta
-        run: |
-          short_sha="${GITHUB_SHA::7}"
-          echo "label=Nightly ${short_sha}" >> "$GITHUB_OUTPUT"
-          echo "artifact_name=${SLUG}-nightly-${short_sha}" >> "$GITHUB_OUTPUT"
-
       - name: Deploy nightly manifest
         uses: peaceiris/actions-gh-pages@v4
         with:
@@ -65,31 +61,31 @@ jobs:
           destination_dir: nightly
           user_name: 'github-actions[bot]'
           user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: "Nightly ${{ env.SHORT_SHA }}"
 
       - name: Update nightly tag
         run: |
-          git tag -f nightly "${GITHUB_SHA}"
-          git push origin refs/tags/nightly --force
+          git tag -f nightly
+          git push origin nightly --force
 
       - name: Publish nightly release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: nightly
-          target_commitish: ${{ github.sha }}
-          name: ${{ steps.nightly_meta.outputs.label }}
-          body: ${{ steps.nightly_meta.outputs.label }}
+          name: Nightly ${{ env.SHORT_SHA }}
           prerelease: true
           make_latest: false
           files: |
             ${{ steps.package.outputs.curseforge_zip }}
             ${{ steps.package_server.outputs.server_zip }}
           overwrite_files: true
           fail_on_unmatched_files: true
+          generate_release_notes: true
 
       - name: Upload nightly artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.nightly_meta.outputs.artifact_name }}
+          name: "${{ env.SLUG }}-nightly-${{ env.SHORT_SHA }}"
           path: |
             ${{ steps.package.outputs.curseforge_zip }}
             ${{ steps.package_server.outputs.server_zip }}

.github/workflows/release.yml

@@ -2,6 +2,8 @@ name: Release Modpack Build
 
 on:
   push:
+    tags:
+      - 'v*'
 
 env:
   MANIFEST_REPO: GregTechLite/gregtechlite.github.io
@@ -37,6 +39,14 @@ jobs:
       - name: Resolve metadata
         run: bash .github/scripts/meta.sh
 
+      - name: Validate release tag
+        run: |
+          expected_tag="v${VERSION}"
+          if [ "${GITHUB_REF_NAME}" != "${expected_tag}" ]; then
+            echo >&2 "Tag ${GITHUB_REF_NAME} does not match pack version ${expected_tag}"
+            exit 1
+          fi
+
       - name: Prepare manifest
         run: bash .github/scripts/manifest.sh
 
@@ -58,18 +68,16 @@ jobs:
           destination_dir: releases/${{ env.VERSION }}
           user_name: 'github-actions[bot]'
           user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: "Release ${{ env.VERSION }}"
 
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: "v${{ env.VERSION }}"
-          target_commitish: ${{ github.sha }}
           name: Release ${{ env.VERSION }}
-          body: Release ${{ env.VERSION }}
           prerelease: false
           make_latest: true
           files: |
             ${{ steps.package.outputs.curseforge_zip }}
             ${{ steps.package_server.outputs.server_zip }}
-          overwrite_files: true
           fail_on_unmatched_files: true
+          generate_release_notes: true