diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml deleted file mode 100644 index 6b818a9f..00000000 --- a/.github/workflows/codacy-analysis.yml +++ /dev/null @@ -1,46 +0,0 @@ -# This workflow checks out code, performs a Codacy security scan -# and integrates the results with the -# GitHub Advanced Security code scanning feature. For more information on -# the Codacy security scan action usage and parameters, see -# https://github.com/codacy/codacy-analysis-cli-action. -# For more information on Codacy Analysis CLI in general, see -# https://github.com/codacy/codacy-analysis-cli. - -name: Codacy Security Scan - -on: - push: - branches: [ development ] - pull_request: - branches: [ development ] - -jobs: - codacy-security-scan: - name: Codacy Security Scan - runs-on: ubuntu-latest - steps: - # Checkout the repository to the GitHub Actions runner - - name: Checkout code - uses: actions/checkout@v2 - - # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis - - name: Run Codacy Analysis CLI - uses: codacy/codacy-analysis-cli-action@1.1.0 - with: - # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository - # You can also omit the token and run the tools that support default configurations - project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} - verbose: true - output: results.sarif - format: sarif - # Adjust severity of non-security issues - gh-code-scanning-compat: true - # Force 0 exit code to allow SARIF file generation - # This will handover control about PR rejection to the GitHub side - max-allowed-issues: 2147483647 - - # Upload the SARIF file generated in the previous step - - name: Upload SARIF results file - uses: github/codeql-action/upload-sarif@v1 - with: - sarif_file: results.sarif diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index dbeaac5d..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,73 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ development ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ development ] - schedule: - - cron: '20 18 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Setup Java JDK - uses: actions/setup-java@v1.4.3 - with: - # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28 - java-version: 11 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml deleted file mode 100644 index 523e8143..00000000 --- a/.github/workflows/downstream.yml +++ /dev/null @@ -1,43 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Downstream Branch Updates - -on: - schedule: - - cron: '20 7 * * *' - # scheduled at 07:00 every Monday and Thursday - - workflow_dispatch: # click the button on Github repo! - - -jobs: - sync_with_upstream: - runs-on: ubuntu-latest - name: Sync main with upstream latest - - steps: - # Step 1: run a standard checkout action, provided by github - - name: Checkout main - uses: actions/checkout@v2 - with: - ref: main - # submodules: 'recursive' ### may be needed in your situation - - # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch - - name: Pull (Fast-Forward) upstream changes - id: sync - uses: aormsby/Fork-Sync-With-Upstream-action@v2.1 - with: - upstream_repository: AtlasMediaGroup/TotalFreedomMod - upstream_branch: main - target_branch: main - git_pull_args: --ff-only # optional arg use, defaults to simple 'pull' - - # Step 3: Display a message if 'sync' step had new commits (simple test) - - name: Check for new commits - if: steps.sync.outputs.has_new_commits - run: echo "There were new commits." - - # Step 4: Print a helpful timestamp for your records (not required, just nice) - - name: Timestamp - run: date diff --git a/.gitignore b/.gitignore index 3e444ba6..3c9f8e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ manifest.mf # Maven excludes /target +/.gradle + # OS generated files .DS_Store ._* diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..9fd08ea3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,167 @@ +plugins { + id 'java' + id 'maven-publish' + id 'com.github.johnrengelman.shadow' version '7.0.0' + id 'net.minecrell.plugin-yml.bukkit' version '0.4.0' + id 'net.researchgate.release' version '2.8.1' +} + +repositories { + mavenLocal() + gradlePluginPortal() + maven { + url = uri('https://repository.apache.org/content/repositories/snapshots/') + } + + maven { + url = uri('https://jitpack.io') + } + + maven { + url = uri('https://repo.codemc.org/repository/maven-public/') + } + + maven { + url = uri('https://repo.codemc.org/repository/nms/') + } + + maven { + url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/') + } + + maven { + url = uri('https://maven.enginehub.org/repo/') + } + + maven { + url = uri('https://maven.elmakers.com/repository/') + } + + maven { + url = uri('https://maven.sk89q.com/artifactory/repo') + } + + maven { + url = uri('https://m2.dv8tion.net/releases/') + } + + maven { + url = uri('https://maven.playpro.com/') + } + + maven { + url = uri('https://repo.md-5.net/content/groups/public/') + } + + maven { + url = uri('https://repo.dmulloy2.net/nexus/repository/public/') + } + + maven { + url = uri('https://maven.sk89q.com/repo/') + } + + maven { + url = uri('https://papermc.io/repo/repository/maven-public/') + } + + maven { + url = uri('https://ci.ender.zone/plugin/repository/everything/') + } + + maven { + url = uri('https://repo.mattmalec.com/repository/releases') + } + + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + + +dependencies { + compileClasspath('commons-io:commons-io:2.8.0') + compileClasspath 'org.apache.commons:commons-lang3:3.11' + compileClasspath 'commons-codec:commons-codec:1.15' + compileClasspath 'com.github.speedxx:Mojangson:1957eef8d6' + compileClasspath 'io.papermc:paperlib:1.0.6' + compileClasspath 'org.reflections:reflections:0.9.12' + compileClasspath 'org.javassist:javassist:3.28.0-GA' + implementation 'org.projectlombok:lombok:1.18.20' + compileClasspath 'org.jetbrains:annotations:21.0.1' + implementation 'org.junit.jupiter:junit-jupiter:5.7.2' + implementation 'org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4' + compileClasspath 'com.mattmalec:Pterodactyl4J:2.BETA_49' + compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' + compileOnly 'com.github.TotalFreedomMC:BukkitTelnet:541e9fdb84' + compileOnly 'com.github.TotalFreedomMC:TF-LibsDisguises:48f01cf2fe' + compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.3.0-SNAPSHOT' + compileOnly 'net.ess3:EssentialsX:2.18.2' + compileOnly 'net.dv8tion:JDA:4.3.0_277' + compileOnly 'net.coreprotect:coreprotect:19.5' + compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5' + compileOnly 'com.github.vexsoftware:votifier:v1.9' + compileOnly 'net.goldtreeservers:worldguardextraflags:4.0.0' + compileOnly 'com.github.AtlasMediaGroup:TFGuilds:master-SNAPSHOT' +} + +group = 'me.totalfreedom' +version = '7.0.0' +description = 'TotalFreedomMod' +java.sourceCompatibility = JavaVersion.VERSION_16 +archivesBaseName = 'TotalFreedomMod-donotuse' + +bukkit { + main = 'me.totalfreedom.totalfreedommod.TotalFreedomMod' + apiVersion = '1.17' + version = '7.0.0' + description = 'Plugin for the Total Freedom server.' + authors = ['Madgeek1450', 'Prozza'] + softDepend = ['BukkitTelnet', 'Essentials', 'CoreProtect', 'LibsDisguises', 'WorldEdit', + 'WorldGuard', 'WorldGuardExtraFlags', 'TFGuilds', 'JDA', 'Votifier'] +} + +shadowJar { + shadowJar { + archiveBaseName.set('TotalFreedomMod') + archiveClassifier.set('') + archiveVersion.set('') + } + minimize() + dependencies { + include(dependency('commons-io:commons-io')) + include(dependency('org.apache.commons:commons-lang3')) + include(dependency('commons-codec:commons-codec')) + include(dependency('org.javassist:javassist')) + include(dependency('io.papermc:paperlib')) + include(dependency('org.reflections:reflections')) + include(dependency('com.github.speedxx:Mojangson')) + include(dependency('org.jetbrains:annotations')) + include(dependency('com.mattmalec:Pterodactyl4J')) + } + relocate 'org.bstats', 'me.totalfreedom.totalfreedommod' + relocate 'io.papermc.lib', 'me.totalfreedom.totalfreedommod.paperlib' + configurations = [project.configurations.compileClasspath] +} + +processResources { + filesMatching('**/gradle.properties') { + filter { + it.replace('version', {version}) + } + } +} + +tasks.build.dependsOn tasks.shadowJar + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..e69de29b diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7454180f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..69a97150 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..744e882e --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml index 8db50868..cb64ac3a 100644 --- a/pom.xml +++ b/pom.xml @@ -288,6 +288,7 @@ com.mattmalec Pterodactyl4J 2.BETA_49 + compile diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..822fa7e5 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'TotalFreedomMod' \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index d5bd702c..00000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: TotalFreedomMod -main: me.totalfreedom.totalfreedommod.TotalFreedomMod -version: ${project.version} -description: Plugin for the Total Freedom server. -softdepend: - - BukkitTelnet - - Essentials - - CoreProtect - - LibsDisguises - - WorldEdit - - WorldGuard - - WorldGuardExtraFlags - - TFGuilds - - JDA - - Votifier -authors: [Madgeek1450, Prozza] -api-version: "1.16" \ No newline at end of file diff --git a/travis-upload.sh b/travis-upload.sh deleted file mode 100644 index e0ed56cb..00000000 --- a/travis-upload.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - mv target/TotalFreedomMod.jar target/TotalFreedomMod-${TRAVIS_COMMIT}.jar - export SSHPASS=${SFTP_PASSWORD} - sshpass -e sftp -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -oBatchMode=no -b - ${SFTP_USER}@${SFTP_HOST}:${SFTP_PATH} << ! - put target/TotalFreedomMod-${TRAVIS_COMMIT}.jar - bye -! - echo "Artifact upload status: "$? -else - echo "Skipping artifact upload for pull request build." -fi