Skip to content

Download Canyon from GitHub for final build #2108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2023
Merged

Download Canyon from GitHub for final build #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
352cb47
Download Canyon from GitHub for final build
Stealthii Apr 30, 2023
575d8fb
Add Canyon build 6 and 26 downloads form GitHub mirror
Stealthii Apr 30, 2023
db551d5
Update README for Canyon changes
Stealthii Apr 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,10 @@ A [Catserver](http://catserver.moe/) type server can be used with

> **NOTE** only `VERSION=b1.7.3` is supported. Since that version pre-dates the health check mechanism used by this image, that will need to be disabled by setting `DISABLE_HEALTHCHECK=true`.

By default, the latest build will be used; however, a specific build number can be selected by setting `CANYON_BUILD`, such as
Canyon is on a temporary hiatus, so by default the final build from GitHub will be used; however, a specific build number can be selected in some instances by setting `CANYON_BUILD`, such as

-e CANYON_BUILD=11
-e CANYON_BUILD=6
-e CANYON_BUILD=26

### Running a SpongeVanilla server

Expand Down
18 changes: 15 additions & 3 deletions scripts/start-deployCanyon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IFS=$'\n\t'
. "${SCRIPTS:-/}start-utils"
isDebugging && set -x

: "${CANYON_BUILD:=lastSuccessfulBuild}"
: "${CANYON_BUILD:=final}"

if [ "${VERSION}" != "b1.7.3" ]; then
log "ERROR: Canyon server type only supports VERSION=b1.7.3"
Expand All @@ -33,8 +33,20 @@ else
fi

if [ ! -f "$SERVER" ]; then
downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
# If CANYON_BUILD is final, then download from GitHub
if [ "${CANYON_BUILD}" = "final" ]; then
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/finalcanyon/canyon-server.jar"
log "Downloading final Canyon build from $downloadUrl ..."
elif [ "${CANYON_BUILD}" = "6" ]; then
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/CanyonRelease/Canyon-Build-6.jar"
log "Downloading Canyon build 6 from $downloadUrl ..."
elif [ "${CANYON_BUILD}" = "26" ]; then
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/CanyonRelease/canyon-build-26.jar"
log "Downloading Canyon build 26 from $downloadUrl ..."
else
downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
fi
curl -fsSL -o "$SERVER" "$downloadUrl"
if [ ! -f "$SERVER" ]; then
log "ERROR: failed to download from $downloadUrl (status=$?)"
Expand Down