Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.21.1/dev

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
This commit is contained in:
IThundxr 2025-02-28 19:21:14 -05:00
commit eccf2de123
Failed to generate hash of commit
3 changed files with 10 additions and 10 deletions

View file

@ -10,7 +10,10 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Java - name: Setup Java
run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV" uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: ModDevGradle Cache - name: ModDevGradle Cache
uses: actions/cache@v4 uses: actions/cache@v4

View file

@ -10,7 +10,10 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Java - name: Setup Java
run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV" uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4

10
Jenkinsfile vendored
View file

@ -23,14 +23,8 @@ pipeline {
stage('Build') { stage('Build') {
steps { steps {
echo 'Building project.'
withCredentials([ sh './gradlew build publish --stacktrace --warn'
file(credentialsId: 'build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile')
]) {
echo 'Building project.'
sh './gradlew build publish --stacktrace --warn'
}
} }
} }
} }