Skip to content

Commit 7e3a8bb

Browse files
committed
[CI] Swap announcer to read directly out of manifest instead
1 parent 98db38c commit 7e3a8bb

File tree

2 files changed

+45
-60
lines changed

2 files changed

+45
-60
lines changed

.github/workflows/_announce-latest-nightly.yml

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,6 @@ on:
1111
required: true
1212

1313
jobs:
14-
vars:
15-
name: Get Variables
16-
runs-on: ubuntu-22.04
17-
outputs:
18-
mcVersion: ${{steps.minecraft.outputs.version}}
19-
neoVersion: ${{steps.neoforge.outputs.version}}
20-
21-
steps:
22-
- name: Checkout
23-
uses: actions/checkout@v4
24-
with:
25-
fetch-depth: 0
26-
27-
- name: Set up JDK
28-
uses: actions/setup-java@v4
29-
with:
30-
distribution: temurin
31-
java-version: 21
32-
33-
- name: Setup Gradle
34-
uses: gradle/actions/setup-gradle@v4
35-
36-
- name: Init Gradle
37-
run: ./gradlew ngInitCM
38-
env:
39-
VERSION: ${{ steps.version.outputs.version }}
40-
41-
- name: MC Version
42-
id: minecraft
43-
run: ./gradlew mcVersion -q >> "$GITHUB_OUTPUT"
44-
env:
45-
VERSION: ${{ steps.version.outputs.version }}
46-
47-
- name: NeoForge Version
48-
id: neoforge
49-
run: ./gradlew neoVersion -q >> "$GITHUB_OUTPUT"
50-
env:
51-
VERSION: ${{ steps.version.outputs.version }}
52-
5314
get-package-info:
5415
name: Get Latest Package Info
5516
runs-on: ubuntu-22.04
@@ -89,6 +50,50 @@ jobs:
8950
name: release
9051
path: release
9152

53+
vars:
54+
name: Get Variables
55+
runs-on: ubuntu-22.04
56+
needs: [get-package-info]
57+
outputs:
58+
jarFile: ${{ fromJson(steps.info.outputs.latestJson)[0].name}}
59+
mcVersion: ${{steps.minecraft.outputs.prop}}
60+
neoVersion: ${{steps.neoforge.outputs.prop}}
61+
62+
steps:
63+
- name: Checkout
64+
uses: actions/checkout@v4
65+
with:
66+
fetch-depth: 0
67+
68+
- name: Grab JAR and Info
69+
uses: actions/download-artifact@v4
70+
with:
71+
name: release
72+
path: .
73+
74+
- name: Read info into variable [latest]
75+
id: info
76+
run: echo "latestJson=$(cat compactmachines-nightly.json)" >> $GITHUB_OUTPUT
77+
78+
- name: Set up JDK
79+
uses: actions/setup-java@v4
80+
with:
81+
distribution: temurin
82+
java-version: 21
83+
84+
- name: Setup Groovy
85+
uses: wtfjoke/setup-groovy@v2
86+
with:
87+
groovy-version: '4.x'
88+
89+
- name: MC Version
90+
id: minecraft
91+
run: groovy read-manifest.groovy ${{ fromJson(steps.info.outputs.latestJson)[0].name}} "Minecraft-Version" >> "$GITHUB_OUTPUT"
92+
93+
- name: NeoForge Version
94+
id: neoforge
95+
run: groovy read-manifest.groovy ${{ fromJson(steps.info.outputs.latestJson)[0].name}} "NeoForge-Version" >> "$GITHUB_OUTPUT"
96+
9297
announce:
9398
name: Discord Announcement
9499
needs: [ vars, get-package-info ]
@@ -109,7 +114,7 @@ jobs:
109114
env:
110115
DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
111116
with:
112-
filename: ${{ fromJson(steps.info.outputs.latestJson)[0].name}}
117+
filename: ${{ needs.vars.outputs.jarFile }}
113118
channel: ${{ secrets.NIGHTLY_CHANNEL_ID }}
114119
modName: Compact Machines
115120
modVersion: ${{ needs.get-package-info.outputs.version }}

build.gradle.kts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,6 @@ plugins {
55
alias(neoforged.plugins.moddev).apply(false)
66
}
77

8-
tasks.register("ngInitCM") {
9-
doLast {
10-
println("ForgeGradle+CM initialized")
11-
}
12-
}
13-
14-
tasks.register("mcVersion") {
15-
doLast {
16-
val mc = mojang.versions.minecraft.get()
17-
println("version=$mc")
18-
}
19-
}
20-
21-
tasks.register("neoVersion") {
22-
doLast {
23-
val neo = neoforged.versions.neoforge.get()
24-
println("version=$neo")
25-
}
26-
}
27-
288
subprojects {
299
repositories {
3010
mavenLocal()

0 commit comments

Comments
 (0)