Skip to content

Commit b0427aa

Browse files
committed
Merge branch '1.19.2' into 1.19.3
* 1.19.2: Removed version updates Fixed workflows
2 parents 7d041cd + bc2fce0 commit b0427aa

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

.github/scripts/generate-run-matrix.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
matrix_content="{\"include\":["
44
enabled_platforms=$(awk -F= '/enabled_platforms/{print $2}' gradle.properties | tr -d ' ')
5+
version=$(awk -F= '/minecraft_version/{print $2; exit}' gradle.properties | tr -d ' ')
56

67
for platform in $(echo $enabled_platforms | tr ',' ' '); do
7-
versions=$(awk -F= '/minecraft_version/{print $2}' gradle.properties | tr -d ' ')
8-
for version in $(echo $versions | tr ',' ' '); do
9-
matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"client\"},"
10-
matrix_content+="$matrix_entry"
11-
matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"server\"},"
12-
matrix_content+="$matrix_entry"
13-
done
8+
matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"client\"},"
9+
matrix_content+="$matrix_entry"
10+
matrix_entry="{\"mod_loader\":\"$platform\",\"version\":\"$version\",\"script\":\"server\"},"
11+
matrix_content+="$matrix_entry"
1412
done
1513

1614
matrix_content="${matrix_content%,}]}"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
fetch-depth: 0
8080

8181
- name: "Set up JDK 17"
82-
if: matrix.version != '1.20.6' && matrix.version != '1.21'
82+
if: matrix.mod_loader.version != '1.20.6' && matrix.mod_loader.version != '1.21'
8383
uses: actions/setup-java@v4
8484
with:
8585
java-version: 17

.github/workflows/publish.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ jobs:
6262
echo "is_mod_loader_supported=false" >> $GITHUB_OUTPUT
6363
fi
6464
65-
- name: "Set up JDK"
66-
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
67-
uses: actions/[email protected]
68-
with:
69-
java-version: 17
70-
distribution: temurin
71-
7265
- name: "Parse gradle properties"
7366
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
7467
id: gradle-properties
@@ -108,6 +101,20 @@ jobs:
108101
name: ${{ steps.gradle-properties.outputs.MOD_NAME }} ${{ steps.gradle-properties.outputs.MOD_VERSION }} for Minecraft ${{ steps.gradle-properties.outputs.MINECRAFT_VERSION }}
109102
bodyFile: RELEASE_CHANGELOG.md
110103

104+
- name: "Set up JDK 17"
105+
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.20.6' && steps.gradle-properties.outputs.MINECRAFT_VERSION != '1.21'
106+
uses: actions/setup-java@v4
107+
with:
108+
java-version: 17
109+
distribution: temurin
110+
111+
- name: "Set up JDK 21"
112+
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true' && steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.20.6' || steps.gradle-properties.outputs.MINECRAFT_VERSION == '1.21'
113+
uses: actions/setup-java@v4
114+
with:
115+
java-version: 21
116+
distribution: temurin
117+
111118
- name: "Setup gradle and run build"
112119
if: steps.check-mod-loader.outputs.is_mod_loader_supported == 'true'
113120
uses: gradle/[email protected]

0 commit comments

Comments
 (0)