Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-14 22:56:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into dev/threaded-worldgen

Browse Source
This commit is contained in:
Simon Gardling 2021-04-08 13:39:25 -04:00
commit 6fdd4e2092
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build.yml vendored
View File

@ -7,12 +7,8 @@ on:
- 'Jenkinsfile' - 'Jenkinsfile'
branches: branches:
- ver/1.16.5 - ver/1.16.5
- ver/1.16.4 - dev/*
- ver/1.16.3 - staging/1.16.5
- ver/1.16.2
- ver/1.16.1
- leaflight/ver/1.16.4
- leaflight/ver/1.16.5
pull_request: pull_request:
paths-ignore: paths-ignore:
- '*.md' - '*.md'
@ -77,7 +73,6 @@ jobs:
./gradlew clean build paperclip ./gradlew clean build paperclip
- name: Upload Artifact - name: Upload Artifact
if: github.ref != 'refs/heads/ver/1.16.4'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Yatopia-${{ matrix.java }} name: Yatopia-${{ matrix.java }}

12
Jenkinsfile vendored
View File

@ -51,12 +51,20 @@ pipeline {
) { ) {
withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
sh ''' sh '''
./gradlew clean build paperclip publish ./gradlew clean build publish
mkdir -p "./target" mkdir -p "./target"
basedir=$(pwd) basedir=$(pwd)
paperworkdir="$basedir/Paper/work" paperworkdir="$basedir/Paper/work"
mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
patchedJarPath="$basedir/Yatopia-Server/build/libs/yatopia-server-$mcver-R0.1-SNAPSHOT.jar"
vanillaJarPath="$paperworkdir/Minecraft/$mcver/$mcver.jar"
cd "$paperworkdir/Paperclip"
mvn -T 2C clean package -Dmcver="$mcver" -Dpaperjar="$patchedJarPath" -Dvanillajar="$vanillaJarPath" -Dstyle.color=never
cd "$basedir"
cp -v "$paperworkdir/Paperclip/assembly/target/paperclip-$mcver.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
''' '''
} }
} }