From b4e0e9984f2b7c8e44c7c12959eaec2bcf7ff79e Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Sat, 8 Feb 2020 11:02:09 +0000 Subject: [PATCH] Try to get CI working again - Mirror all dependencies, like we've done on master - Run gradle build twice. Apparently the first time the dependencies aren't always available. --- .github/workflows/main-ci.yml | 4 ++-- build.gradle | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index d0caedbf2..dd66a8bcb 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up JDK 1.8 uses: actions/setup-java@v1 @@ -16,7 +16,7 @@ jobs: java-version: 1.8 - name: Build with Gradle - run: ./gradlew build --no-daemon + run: ./gradlew build --no-daemon || ./gradlew build --no-daemon - name: Upload Jar uses: actions/upload-artifact@v1 diff --git a/build.gradle b/build.gradle index 9d1f2f447..f3b3c7693 100644 --- a/build.gradle +++ b/build.gradle @@ -82,18 +82,10 @@ accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg') } repositories { - maven { - name "JEI" - url "https://dvs1.progwml6.com/files/maven" - } maven { name "SquidDev" url "https://squiddev.cc/maven" } - maven { - name "CraftTweaker" - url "https://maven.blamejared.com/" - } } configurations { @@ -107,10 +99,10 @@ accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg') minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.25:api") - compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.1.150") + compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.27:api") + compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.1.162") - runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.25") + runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.27") shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'