Commit f4aab7d1 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.8.3

parents d30b2c8c 0e53c709
Pipeline #401045861 passed with stages
in 26 minutes and 4 seconds
......@@ -4,4 +4,4 @@ usr/share/games/armagetronad/models
usr/share/games/armagetronad/sound
usr/share/games/armagetronad/textures
usr/share/icons/hicolor
usr/share/applications
\ No newline at end of file
usr/share/applications
......@@ -225,18 +225,12 @@ ZI_GIT=git@gitlab.com:armagetronad/zeroinstall.git
UPLOAD_ZI_SCP=arma0install@builder.armagetronad.org:/home/arma0install/0install/
#UPLOAD_ZI_SCP=arma0install@builder.armagetronad.org:/home/arma0install/0install-staging/
DOWNLOAD_URI_BASE_STAGING=http://download.armagetronad.org/staging/${SF_DIR}/@version@/
if test ${STAGING} == true; then
# download URI base to use for zeroinstall staging and macOS builds
DOWNLOAD_URI_BASE=${DOWNLOAD_URI_BASE_STAGING}
elif test "${SF_DIR}" == "stable"; then
# only stable builds go to launchpad permanently
DOWNLOAD_URI_BASE=https://launchpad.net/${LP_PROJECT}/${LP_SERIES}/${LP_VERSION}/+download/
if test ${STAGING} == true || test "${SF_DIR}" != "stable"; then
# download URI base to use for zeroinstall and the download site; use our own storage for transient builds
DOWNLOAD_URI_BASE=http://download.armagetronad.org/staging/${SF_DIR}/@version@/
else
# the rest reference to sourceforge
# DOWNLOAD_URI_BASE=https://sourceforge.net/projects/armagetronad/files/${SF_DIR}/@version@/
# or not. SF certificates have been broken for quite a while.
DOWNLOAD_URI_BASE=http://download.armagetronad.org/staging/${SF_DIR}/@version@/
# only final stable builds go to launchpad permanently
DOWNLOAD_URI_BASE=https://launchpad.net/${LP_PROJECT}/${LP_SERIES}/${LP_VERSION}/+download/
fi
# **********************************************************************
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment