Skip to content

Commit bbe2770

Browse files
committed
Update github actions to use the newer gradle actions, and make the game test action also run unit tests
1 parent 9d5b9a0 commit bbe2770

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

.github/workflows/gametests.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,22 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525

26+
- name: Validate Gradle Wrapper
27+
uses: gradle/actions/wrapper-validation@v3
28+
2629
- name: Setup Java
2730
uses: actions/setup-java@v4
2831
with:
2932
java-version: 21
3033
distribution: 'temurin'
3134

32-
- name: Build with Gradle
33-
uses: gradle/gradle-build-action@v3
35+
- name: Setup Gradle
36+
uses: gradle/actions/setup-gradle@v3
3437
with:
35-
gradle-version: wrapper
36-
arguments: :runGameTestServer
37-
cache-read-only: false
38+
cache-read-only: false
39+
40+
- name: Run Game Tests with Gradle
41+
run: ./gradlew runGameTestServer
42+
43+
- name: Run Unit Tests with Gradle
44+
run: ./gradlew testJunit

.github/workflows/gradle-publish.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,22 @@ jobs:
5151
build/neoForm
5252
~/.gradle
5353
.gradle
54+
- name: Validate Gradle Wrapper
55+
uses: gradle/actions/wrapper-validation@v3
5456
- name: Setup Java
5557
uses: actions/setup-java@v4
5658
with:
5759
java-version: 21
5860
distribution: 'temurin'
5961
settings-path: ${{ github.workspace }} # location for the settings.xml file
6062

61-
- name: Build with Gradle
62-
uses: gradle/gradle-build-action@v3
63+
- name: Setup Gradle
64+
uses: gradle/actions/setup-gradle@v3
6365
with:
64-
arguments: build outputChangelog
65-
gradle-version: wrapper
6666
cache-read-only: false
67+
68+
- name: Build with Gradle
69+
run: ./gradlew build outputChangelog
6770
env:
6871
BUILD_NUMBER: ${{ github.run_number }}
6972
GIT_COMMIT: ${{ github.sha }}
@@ -78,19 +81,15 @@ jobs:
7881
7982
- name: GH Release
8083
id: gh_release
81-
uses: softprops/action-gh-release@v1
84+
uses: softprops/action-gh-release@v2
8285
with:
8386
files: build/libs/!(MekanismDefense*).jar
8487
body_path: build/changelog.md
8588
tag_name: v${{ steps.gradle_props.outputs.minecraft_version }}-${{ steps.gradle_props.outputs.mod_version }}.${{ github.run_number }}
8689
target_commitish: ${{ github.sha }}
8790

8891
- name: Publish
89-
uses: gradle/gradle-build-action@v3
90-
with:
91-
arguments: curseforge modrinth publish
92-
gradle-version: wrapper
93-
cache-read-only: false
92+
run: ./gradlew curseforge modrinth publish
9493
env:
9594
CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
9695
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

0 commit comments

Comments
 (0)