Update to the new workflows

neoforged · Dec 2, 2023 · a616a63 · a616a63
1 parent aaf82a3
commit a616a63
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml
@@ -7,21 +7,14 @@ on:
       - opened
       - ready_for_review
       - reopened
+  push:
+    branches:
+      - 'feature/**'
+  workflow_dispatch:
 
 jobs:
-  jdk17:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Setup JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build licenseFormat
+  build:
+    uses: neoforged/actions/.github/workflows/build-prs.yml@main
+    with:
+      java: 8
+      gradle_tasks: test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,20 +9,18 @@ permissions:
   statuses: write
 
 jobs:
-  build:
+  release:
     uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
     with:
       java: 8
-      pre_gradle_tasks: 'licenseFormat'
-      gradle_tasks: 'publish closeAndReleaseSonatypeStagingRepository'
+      pre_gradle_tasks: test
+      gradle_tasks: publish closeAndReleaseSonatypeStagingRepository
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-
       MAVEN_USER: ${{ secrets.MAVEN_USER }}
       MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-
+      GPG_SUBKEY: ${{ secrets.GPG_SUBKEY }}
+      GPG_SUBKEY_ID: ${{ secrets.GPG_SUBKEY_ID }}
+      GPG_SUBKEY_PASSWORD: ${{ secrets.GPG_SUBKEY_PASSWORD }}
       SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-
-      GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-      GPG_KEY_PASSWORD: ${{ secrets.GPG_KEY_PASSWORD }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}