修改构建脚本

Anvil-Dev · Dec 4, 2024 · 5b6887c · 5b6887c
1 parent d743a82
commit 5b6887c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 45 deletions.
diff --git a/.github/workflows/21_ci.yml b/.github/workflows/21_ci.yml
@@ -2,9 +2,6 @@ name: CI for AnvilCraftMod 1.21.1+
 on: workflow_call
 
 jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/21_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
@@ -53,10 +50,15 @@ jobs:
           path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
 
       - name: Publish to maven
-        if: ${{ github.event.inputs.publish == 'true' }}
         run: ./gradlew publish
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
         continue-on-error: true
+
+      - name: gametest
+        uses: Anvil-Dev/[email protected]
+        with:
+          mod: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.21-87-neoforge cloth-config:15.0.140+neoforge
diff --git a/.github/workflows/21_gametest.yml b/.github/workflows/21_gametest.yml
diff --git a/.github/workflows/21_pull_request.yml b/.github/workflows/21_pull_request.yml
@@ -2,9 +2,6 @@ name: Pull Request Check for AnvilCraftMod 1.21.1+
 on: workflow_call
 
 jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/21_gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
@@ -51,3 +48,9 @@ jobs:
         with:
           name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
           path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+
+      - name: gametest
+        uses: Anvil-Dev/[email protected]
+        with:
+          mod: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.21-87-neoforge cloth-config:15.0.140+neoforge
diff --git a/.github/workflows/21_release.yml b/.github/workflows/21_release.yml
@@ -52,7 +52,6 @@ jobs:
           path: build/libs/anvilcraft-neoforge-${{ steps.version.outputs.version }}.jar
 
       - name: Publish to maven
-        if: ${{ github.event.inputs.publish == 'true' }}
         run: ./gradlew publish
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -1,7 +1,7 @@
 name: Pull Request Check
 on:
   workflow_dispatch:
-  push:
+  pull_request:
     branches:
       - releases/**
     paths: