From 6576f55c559779b8c967a81b1b3cca1ea6122443 Mon Sep 17 00:00:00 2001 From: Mitchell Skaggs Date: Thu, 23 Jun 2022 04:49:50 -0500 Subject: [PATCH] Fix CI --- .gitlab-ci.yml | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d73eb2c3..21d797ab5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ build_16_5: script: - echo "Building 1.16.5..." - ./gradlew deleteMerged --gradle-user-home cache/; - - ./gradlew build -PmcVer=1.16.5 --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:16 artifacts: @@ -50,7 +50,7 @@ build_17_1: script: - echo "Building 1.17.1..." - ./gradlew deleteMerged --gradle-user-home cache/; - - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:16 artifacts: @@ -74,7 +74,7 @@ build_18_1: script: - echo "Building 1.18.1..." - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job - - ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; # build using Java 17 image: eclipse-temurin:17 @@ -99,7 +99,7 @@ build_18_2: script: - echo "Building 1.18.2..." - ./gradlew deleteMerged --gradle-user-home cache/; - - ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: @@ -122,7 +122,7 @@ build_19: script: - echo "Building 1.19..." - ./gradlew deleteMerged --gradle-user-home cache/; - - ./gradlew build -PmcVer=1.19 --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/; - ./gradlew merge --gradle-user-home cache/; image: eclipse-temurin:17 artifacts: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2880ba80..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists