From fea0b562a5fdb4f3d9031f0875638c9543cfd7af Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 16 Mar 2021 18:25:29 -0400 Subject: [PATCH] use paperclip instead of yatoclip (#440) * use paperclip instead of yatoclip * update README.md --- .github/workflows/build.yml | 4 ++-- Jenkinsfile | 4 ++-- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e11dd13e..38058454 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,12 +75,12 @@ jobs: - name: Build Yatopia run: | - ./gradlew clean build yatoclip + ./gradlew clean build paperclip - name: Upload Artifact if: github.ref != 'refs/heads/ver/1.16.4' uses: actions/upload-artifact@v2 with: name: Yatopia-${{ matrix.java }} - path: yatopia-1.16.5-yatoclip.jar + path: yatopia-1.16.5-paperclip.jar diff --git a/Jenkinsfile b/Jenkinsfile index cafa13f8..cd91b073 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,12 +51,12 @@ pipeline { ) { withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) { sh ''' - ./gradlew clean build yatoclip publish + ./gradlew clean build paperclip publish mkdir -p "./target" basedir=$(pwd) paperworkdir="$basedir/Paper/work" 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" ''' } } diff --git a/README.md b/README.md index bc57ee7e..2d1f6158 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ## Building and setting up ./gradlew initGitSubmodules ./gradlew setupUpstream ./gradlew applyPatches -./gradlew yatoclip +./gradlew paperclip ```