fix up github CI

TeamPneumatic · May 6, 2024 · bd423cc · bd423cc
1 parent 78d42e9
commit bd423cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -42,7 +42,8 @@ body:
     attributes:
       label: Which Minecraft version are you using?
       options:
-        - "1.20"
+        - "1.20.4"
+        - "1.20.1"
         - "1.19"
         - "1.18 - critical bugs only"
         - "1.16 - UNSUPPORTED"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,11 +13,11 @@ jobs:
       !contains(github.event.head_commit.message, '[ci skip]')
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Remove any generated assets/data
@@ -31,11 +31,10 @@ jobs:
       - name: Set up mod metadata
         id: mod_meta
         run: |
-          echo mc_version=$(grep ^minecraft_version= ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT
+          echo mc_version=$(grep ^mc_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT
       - name: Build JAR and Publish to Modmaven
         uses: gradle/gradle-build-action@v2
         env:
-          BUILD_NUMBER: ${{ github.run_number }}
           MODMAVEN_USER: ${{ secrets.MODMAVEN_USER }}
           MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,11 +17,11 @@ jobs:
         run: |
           echo "TAG=${TAG}" >> $GITHUB_ENV
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Remove any generated assets/data
@@ -41,35 +41,22 @@ jobs:
       - name: Set up mod metadata
         id: mod_meta
         run: |
-          echo mc_version=$(grep ^minecraft_version= ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT
+          echo mod_version=$(grep ^mod_version_ ./gradle.properties | cut -d= -f2 | tr '\012' '.' | sed -e 's/\.$//') >> $GITHUB_OUTPUT
+          echo mc_version=$(grep ^mc_version ./gradle.properties | cut -d= -f2) >> $GITHUB_OUTPUT
       - name: Publish to Modmaven
         uses: gradle/gradle-build-action@v2
         env:
           MODMAVEN_USER: ${{ secrets.MODMAVEN_USER }}
           MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
         with:
           arguments: publishMavenPublicationToModmavenRepository --no-daemon
-      - name: Publish to Modrinth
+      - name: Publish to Curseforge/Modrinth
         uses: gradle/gradle-build-action@v2
         env:
           CHANGELOG: ${{ github.event.release.body }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-          BUILD_NUMBER: ${{ github.run_number }}
-        with:
-          arguments: modrinth --no-daemon
-      - name: Publish to Curseforge
-        uses: gradle/gradle-build-action@v2
-        env:
-          CHANGELOG: ${{ github.event.release.body }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
           BUILD_NUMBER: ${{ github.run_number }}
         with:
-          arguments: curseforge --no-daemon
-      - name: Discord notification
-        uses: Ilshidur/action-discord@master
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if:
-          env.DISCORD_WEBHOOK != null
-        with:
-          args: 'Release ${{ github.event.release.tag_name }} done for project {{ EVENT_PAYLOAD.repository.full_name }} (Minecraft ${{ steps.mod_meta.outputs.mc_version}}): ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.'
+          arguments: publishMods --no-daemon