Skip to content

Commit b0920ed

Browse files
committed
Adjust github actions to allow gradle to make use of the configuration cache
1 parent 5ed0e20 commit b0920ed

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

.github/workflows/gametests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Gradle
3636
uses: gradle/actions/setup-gradle@v3
3737
with:
38-
cache-read-only: false
38+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3939

4040
- name: Run Game Tests with Gradle
4141
run: ./gradlew runGameTestServer

.github/workflows/gradle-publish.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ jobs:
4949
path: |
5050
build/neoForge
5151
build/neoForm
52-
~/.gradle
53-
.gradle
5452
- name: Validate Gradle Wrapper
5553
uses: gradle/actions/wrapper-validation@v3
5654
- name: Setup Java
@@ -63,7 +61,7 @@ jobs:
6361
- name: Setup Gradle
6462
uses: gradle/actions/setup-gradle@v3
6563
with:
66-
cache-read-only: false
64+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
6765

6866
- name: Build with Gradle
6967
run: ./gradlew build outputChangelog

build.gradle

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,14 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
610610

611611
def changelog = outputChangelog.flatMap(c -> c.outputFile)
612612
inputs.file(changelog)
613+
inputs.property('release_type', release_type)
614+
inputs.property('java_version', java_version)
615+
inputs.property('minecraft_version', minecraft_version)
613616

617+
//debugMode.set(true)
618+
disableVersionDetection()
614619
apiToken = System.getenv('CURSEFORGE_KEY') ?: project.findProperty('curseforgeKey')
620+
//apiToken.set(project.providers.environmentVariable('CURSEFORGE_KEY').orElse(project.providers.gradleProperty('curseforgeKey')))
615621

616622
//Main Mekanism Project
617623
def mainCfUpload = task.upload(268560, jar) { main ->
@@ -645,18 +651,26 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
645651
doLast {
646652
//Note: Quiet is the level above warning but below error. We want these to show regardless of logging level
647653
// see: https://docs.gradle.org/current/userguide/logging.html
648-
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism/files/{}', mainCfUpload.curseFileId)
649-
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-additions/files/{}', additionsCfUpload.curseFileId)
650-
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-generators/files/{}', generatorsCfUpload.curseFileId)
651-
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-tools/files/{}', toolsCfUpload.curseFileId)
654+
//Note: We cast to object to be explicit, so that when we have CurseForgeGradle in debug mode and these are null
655+
// then it can resolve which overload to use
656+
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism/files/{}', (Object) mainCfUpload.curseFileId)
657+
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-additions/files/{}', (Object) additionsCfUpload.curseFileId)
658+
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-generators/files/{}', (Object) generatorsCfUpload.curseFileId)
659+
logger.quiet('https://www.curseforge.com/minecraft/mc-mods/mekanism-tools/files/{}', (Object) toolsCfUpload.curseFileId)
652660
}
653661
})
654662
}
655663

656664
void setGenericCurseArtifactData(UploadArtifact artifact, Provider<RegularFile> changelog) {
657665
artifact.changelog = changelog
658666
artifact.changelogType = 'markdown'
659-
artifact.releaseType = "${release_type}"
667+
artifact.releaseType = release_type
668+
//artifact.changelog.set(changelog.map(file -> file.asFile.text))
669+
//artifact.changelogType.set('markdown')
670+
//artifact.releaseType.set(release_type)
671+
artifact.addModLoader('NeoForge')
672+
artifact.addJavaVersion("Java ${java_version}")
673+
artifact.addGameVersion(minecraft_version)
660674
}
661675

662676
UploadArtifact uploadSecondaryCurseProject(TaskPublishCurseForge task, long projectId, Provider<RegularFile> changelog, TaskProvider<Jar> sourceSetJar) {

0 commit comments

Comments
 (0)