Skip to content

Commit 91460e9

Browse files
committed
Fix publish to GH actions
Dunno why this worked, re-arranging the manifest bit fixed it
1 parent 9db307f commit 91460e9

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

.github/workflows/_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
path: neoforge-main/src/generated/resources
3636

3737
- name: Publish
38-
run: ./gradlew :neoforge-main:publish
38+
run: ./gradlew :neoforge-main:publishCompactmachinesPublicationToGitHubPackagesRepository
3939
env:
4040
VERSION: ${{ inputs.version }}
4141
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

core-api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ tasks.withType<Jar> {
5050
val now = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date())
5151
attributes(
5252
mapOf(
53+
"Automatic-Module-Name" to "compactmachines.api",
5354
"Specification-Title" to "Compact Machines - Core API",
5455
"Specification-Version" to "1", // We are version 1 of ourselves
5556
"Implementation-Title" to "Compact Machines - Core API",
5657
"Implementation-Timestamp" to now,
5758
"FMLModType" to "LIBRARY",
5859
"Minecraft-Version" to mojang.versions.minecraft.get(),
5960
"NeoForge-Version" to neoforged.versions.neoforge.get(),
60-
"Main-Commit" to gitVersion,
61-
"Automatic-Module-Name" to "compactmachines.api"
61+
"Main-Commit" to gitVersion
6262
)
6363
)
6464
}

neoforge-main/build.gradle.kts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,13 @@ neoForge {
7272
runs {
7373
// applies to all the run configs below
7474
configureEach {
75-
7675
logLevel.set(Level.DEBUG)
77-
7876
sourceSet = project.sourceSets.main
7977

80-
if (!System.getenv().containsKey("CI")) {
81-
// JetBrains Runtime Hotswap
82-
// jvmArgument("-XX:+AllowEnhancedClassRedefinition")
83-
}
78+
// JetBrains Runtime Hotswap
79+
// if (!System.getenv().containsKey("CI")) {
80+
// jvmArgument("-XX:+AllowEnhancedClassRedefinition")
81+
// }
8482
}
8583

8684
create("client") {
@@ -127,7 +125,6 @@ neoForge {
127125
environment.put("CM_TEST_RESOURCES", file("src/test/resources").path)
128126

129127
sourceSet = project.sourceSets.test
130-
// sourceSets.add(project.sourceSets.test.get())
131128
}
132129
}
133130
}
@@ -141,8 +138,8 @@ repositories {
141138
}
142139
}
143140

144-
maven("https://maven.pkg.github.com/compactmods/compactmachines-core") {
145-
name = "Github PKG Core"
141+
maven("https://maven.pkg.github.com/compactmods/feather") {
142+
name = "Github PKG - Feather"
146143
credentials {
147144
username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
148145
password = project.findProperty("gpr.token") as String? ?: System.getenv("GITHUB_TOKEN")
@@ -173,9 +170,9 @@ dependencies {
173170
testImplementation(libraries.jnanoid)
174171
jarJar(libraries.jnanoid)
175172

176-
jarJar(coreApi)
177173
compileOnly(coreApi)
178174
testCompileOnly(coreApi)
175+
jarJar(coreApi)
179176

180177
compileOnly(libraries.feather)
181178
testImplementation(libraries.feather)
@@ -189,10 +186,6 @@ dependencies {
189186

190187
additionalRuntimeClasspath(libraries.feather)
191188
additionalRuntimeClasspath(libraries.jnanoid)
192-
193-
// Mods
194-
// compileOnly(mods.bundles.jei)
195-
// compileOnly(mods.jade)
196189
}
197190

198191
tasks.withType<Test> {
@@ -234,7 +227,7 @@ tasks.withType<Jar> {
234227
}
235228

236229
tasks.withType<ProcessResources>().configureEach {
237-
var replaceProperties: Map<String, Any> = mapOf(
230+
val replaceProperties: Map<String, Any> = mapOf(
238231
"minecraft_version" to mojang.versions.minecraft.get(),
239232
"neo_version" to neoforged.versions.neoforge.get(),
240233
"minecraft_version_range" to mojang.versions.minecraftRange.get(),

0 commit comments

Comments
 (0)