From c86babf988e98d742b3392cb14c55650e4d6aa7c Mon Sep 17 00:00:00 2001 From: lexikiq Date: Tue, 4 May 2021 12:11:28 -0400 Subject: [PATCH] Hopefully fix workflows --- .github/workflows/pr-build.yml | 2 +- .github/workflows/push-build.yml | 2 +- parchment | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index c35e05b..90b455e 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -30,7 +30,7 @@ jobs: git config --global user.email "you@example.com" git config --global user.name "Your Name" git submodule update --init --recursive - ./parchment jar + ./parchment ghjar - uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/push-build.yml b/.github/workflows/push-build.yml index a4e1609..819319d 100644 --- a/.github/workflows/push-build.yml +++ b/.github/workflows/push-build.yml @@ -30,7 +30,7 @@ jobs: git config --global user.email "you@example.com" git config --global user.name "Your Name" git submodule update --init --recursive - ./parchment jar + ./parchment ghjar - uses: actions/upload-artifact@v2 with: diff --git a/parchment b/parchment index 7d7fa0d..878e296 100755 --- a/parchment +++ b/parchment @@ -80,6 +80,25 @@ case "$1" in mvn clean install ) ;; + "ghjar") + ( + # github install because workflows are dumb + basedir + cd "$basedir" + if [ "$2" != "fast" ]; then + scripts/upstream.sh + fi + ./scripts/apply.sh "$basedir" + cd "$basedir" + mvn -N install + cd ${FORK_NAME}-Common && mvn -e clean install -Dmaven.javadoc.skip=true + cd ${FORK_NAME}-API && mvn -e clean install -Dmaven.javadoc.skip=true + cd ../Paper/Paper-MojangAPI && mvn -e clean install + cd ../../${FORK_NAME}-Server && mvn -e clean install + cd "$basedir" + ./scripts/paperclip.sh + ) + ;; "d" | "deploy") ( basedir