From 09e54e9d156d4edb2aaa05a708b18af84cd08c0e Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Mon, 14 Jun 2021 00:45:42 +0200 Subject: [PATCH] update github action to the new setup --- .github/workflows/build.yml | 12 ++++++------ build.gradle.kts | 2 +- settings.gradle.kts | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0da3c7e06f..b8ae06caf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,14 +26,14 @@ jobs: uses: actions/cache@v2 with: path: | - ~/.m2/repository/ - work/Minecraft - key: ${{ runner.os }}-paper-2-${{ hashFiles('**/pom.xml') }} + ~/.gradle/caches + ~/.gradle/jdks + ~/.gradle/native + ~/.gradle/wrapper + key: ${{ runner.os }}-paper-2-${{ hashFiles('**/*.gradle*', 'gradle/**', 'gradle.properties') }} restore-keys: ${{ runner.os }}-paper-2 - name: Patch and build run: | git config --global user.email "no-reply@github.com" git config --global user.name "Github Actions" - ./paper build - - name: Build javadocs - run: mvn -pl Paper-API,Paper-MojangAPI -am javadoc:javadoc + ./gradlew applyPatches build diff --git a/build.gradle.kts b/build.gradle.kts index 101bc900a8..407f27e9d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.core") version "1.0.0-LOCAL-SNAPSHOT" + id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT" } val mcVersion = providers.gradleProperty("mcVersion") diff --git a/settings.gradle.kts b/settings.gradle.kts index 302bcb31ab..54bb957497 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,5 @@ pluginManagement { repositories { - mavenLocal() gradlePluginPortal() maven("https://wav.jfrog.io/artifactory/repo/") }