Skip to content

Commit 13774a6

Browse files
donoghucmergify[bot]
authored andcommitted
Downgrade gradle to coninute testing on windows server 2016 (#18263)
* Downgrade gradle to coninute testing on windows server 2016 * REVERT ME! Temporarily force testing on win 2016 * Revert "REVERT ME! Temporarily force testing on win 2016" This reverts commit 079898b. * update gradle wrapper (cherry picked from commit 8a92bbb) # Conflicts: # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew
1 parent 88a260f commit 13774a6

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
<<<<<<< HEAD
34
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
5+
=======
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
7+
>>>>>>> 8a92bbb6 (Downgrade gradle to coninute testing on windows server 2016 (#18263))
48
networkTimeout=10000
59
validateDistributionUrl=true
610
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ done
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
8686
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
<<<<<<< HEAD
8788
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
=======
90+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
91+
' "$PWD" ) || exit
92+
>>>>>>> 8a92bbb6 (Downgrade gradle to coninute testing on windows server 2016 (#18263))
8893

8994
# Use the maximum available, or set MAX_FD != -1 to use that value.
9095
MAX_FD=maximum

0 commit comments

Comments
 (0)