From 2708ff18e75bfa636a21544498cd54368a5f0168 Mon Sep 17 00:00:00 2001 From: Luke Bemish Date: Mon, 20 Nov 2023 15:38:44 +0000 Subject: [PATCH] Fix runs to use build cache --- .github/workflows/release.yml | 11 +++++++++++ .github/workflows/snapshot.yml | 3 +++ gradle/libs.versions.toml | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ed2b40..ac6e060 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,9 +26,17 @@ jobs: - name: Tag Release run: | ./gradlew tagRelease + env: + BUILD_CACHE_URL: ${{ secrets.BUILD_CACHE_URL }} + BUILD_CACHE_USER: ${{ secrets.BUILD_CACHE_USER }} + BUILD_CACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }} - name: Build run: | ./gradlew build + env: + BUILD_CACHE_URL: ${{ secrets.BUILD_CACHE_URL }} + BUILD_CACHE_USER: ${{ secrets.BUILD_CACHE_USER }} + BUILD_CACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }} - name: Publish run: | ./gradlew publish curseforge modrinth closeAndReleaseSonatypeStagingRepository @@ -39,6 +47,9 @@ jobs: GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }} MODRINTH_KEY: ${{ secrets.MODRINTH_KEY }} + BUILD_CACHE_URL: ${{ secrets.BUILD_CACHE_URL }} + BUILD_CACHE_USER: ${{ secrets.BUILD_CACHE_USER }} + BUILD_CACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }} - run: | git push git push --tags diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 9766d60..fe353a5 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -34,6 +34,9 @@ jobs: ./gradlew build env: SNAPSHOT_MAVEN_URL: https://maven.lukebemish.dev/snapshots/ + BUILD_CACHE_URL: ${{ secrets.BUILD_CACHE_URL }} + BUILD_CACHE_USER: ${{ secrets.BUILD_CACHE_USER }} + BUILD_CACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }} - name: Test - Fabric if: (success() || failure()) && steps.build.conclusion == 'success' run: | diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e4b68aa..08f7351 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,6 @@ fabric_loader = "0.14.24" fabric_api = "0.89.3+1.20.2" neoforge = "20.2.59-beta" -neogradle = "7.0.26" jetbrains_annotations = "24.0.1" autoservice = "1.1.1" @@ -39,7 +38,7 @@ mixinextras_neoforge = { module = "io.github.llamalad7:mixinextras-neoforge", ve [plugins] architectury_loom = { id = "dev.architectury.loom", version = "1.4.367" } mdg_plugin = {id = "org.groovymc.modsdotgroovy", version = "1.4.3"} -curseforgegradle = {id = "net.darkhax.curseforgegradle", version = "1.1.16"} +curseforgegradle = {id = "net.darkhax.curseforgegradle", version = "1.1.17"} minotaur = {id = "com.modrinth.minotaur", version = "2.8.1"} managedversioning = {id = "dev.lukebemish.managedversioning", version.ref = "managedversioning"} nexuspublish = {id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexuspublish"}