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

use paperclip instead of yatoclip (#440)

Browse Source 
* use paperclip instead of yatoclip

* update README.md
This commit is contained in:
Simon Gardling 2021-03-16 18:25:29 -04:00 committed by GitHub
parent c4a68471e4
commit fea0b562a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,12 +75,12 @@ jobs:
- name: Build Yatopia - name: Build Yatopia
run: | run: |
./gradlew clean build yatoclip ./gradlew clean build paperclip
- name: Upload Artifact - name: Upload Artifact
if: github.ref != 'refs/heads/ver/1.16.4' 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 }}
path: yatopia-1.16.5-yatoclip.jar path: yatopia-1.16.5-paperclip.jar

4
Jenkinsfile vendored
View File

@ -51,12 +51,12 @@ 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 yatoclip publish ./gradlew clean build paperclip 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-yatoclip.jar" "./target/yatopia-$mcver-yatoclip-b$BUILD_NUMBER.jar" cp "yatopia-$mcver-paperclip.jar" "./target/yatopia-$mcver-paperclip-b$BUILD_NUMBER.jar"
''' '''
} }
} }

2
README.md
View File

@ -35,7 +35,7 @@ ## Building and setting up
./gradlew initGitSubmodules ./gradlew initGitSubmodules
./gradlew setupUpstream ./gradlew setupUpstream
./gradlew applyPatches ./gradlew applyPatches
./gradlew yatoclip ./gradlew paperclip
``` ```