Skip to content

Commit 00585e3

Browse files
committed
updated nightly.yml, updated root build.gradle
1 parent 9cde669 commit 00585e3

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
3232
settings-path: ${{ github.workspace }} # location for the settings.xml file
3333
- name: Setup Gradle Dependencies Cache
34-
uses: actions/cache@v2
34+
uses: actions/cache@v4
3535
with:
3636
path: ~/.gradle/caches
3737
~/.gradle/wrapper
38-
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle','**/gradle/wrapper/gradle-wrapper.properties','**/*.properties') }}
38+
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.properties') }}
3939
- name: Build with Gradle
4040
run: ./gradlew build --stacktrace
4141
# The USERNAME and TOKEN need to correspond to the credential environment variables used in

build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ plugins {
44
id "fabric-loom" version "1.7-SNAPSHOT" apply false
55
}
66

7-
def isCI = System.getenv("GITHUB_ACTION")
8-
def isRELEASE = System.getenv("GITHUB_RELEASE")
7+
def isGITHU_ACTION = System.getenv("GITHUB_ACTION")
98
def gitHash() {
109
String hash = System.getenv("GITHUB_SHA")
1110
if (hash != null) return hash.substring(0,8)
@@ -29,11 +28,8 @@ subprojects {
2928
it.options.encoding = 'UTF-8'
3029
}
3130

32-
if (isCI) {
33-
if (!isRELEASE){
34-
version = version + "-" + gitHash()
35-
println("Not in CI Release mode")
36-
}
31+
if (isGITHU_ACTION) {
32+
version = version + "-" + gitHash()
3733
println("In CI mode")
3834
}
3935
}

0 commit comments

Comments
 (0)