1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-10-10 05:16:12 +00:00

fixed problems with linuxdeploy which were stopping normal testing

This commit is contained in:
Stephen Gaito 2020-08-19 09:46:43 +00:00
parent 06a8f7b3c6
commit c2ec4ca548
3 changed files with 24 additions and 2 deletions

View File

@ -53,7 +53,7 @@ cd ../imageBuild
LINUX_DEPLOY_APP_IMAGE=linuxdeploy-$MACHINE_ARCH.AppImage
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LINUX_DEPLOY_APP_IMAGE
wget $LINUX_DEPLOY_URL/$LINUX_DEPLOY_APP_IMAGE
chmod a+x $LINUX_DEPLOY_APP_IMAGE

View File

@ -5,6 +5,7 @@
# source ./buildScripts/reSourceVersionEnvs
. ./buildScripts/reSourceVersionEnvs
echo ""
echo "TravisCI env:"
echo " dist: [$TRAVIS_DIST]"
echo " tag: [$TRAVIS_TAG]"
@ -12,6 +13,7 @@ echo " branch: [$TRAVIS_BRANCH]"
echo " commit: [$TRAVIS_COMMIT]"
echo " build dir: [$TRAVIS_BUILD_DIR]"
echo " repo slug: [$TRAVIS_REPO_SLUG]"
echo ""
echo "Build env:"
echo " prefix: [$PDF2HTMLEX_PREFIX]"
@ -19,6 +21,8 @@ echo " unattended: [$UNATTENDED]"
echo " make parallel: [$MAKE_PARALLEL]"
echo " OS: [$BUILD_OS]"
echo " distribution: [$BUILD_DIST]"
echo " linuxdeploy url: [$LINUX_DEPLOY_URL]"
echo ""
echo "pdf2htmlEX env:"
echo " version: [$PDF2HTMLEX_VERSION]"
@ -26,6 +30,7 @@ echo " poppler: [$POPPLER_VERSION]"
echo " fontforge: [$FONTFORGE_VERSION]"
echo " pdf2htmlEX: [$PDF2HTMLEX_BRANCH]"
echo " machine arch: [$MACHINE_ARCH]"
echo ""
echo "release env:"
echo " build date: [$BUILD_DATE]"
@ -35,3 +40,4 @@ echo " container name: [$CONTAINER_NAME]"
echo " appImage name: [$APPIMAGE_NAME]"
echo " dpkg name: [$DPKG_NAME]"
echo "uploadTool suffix: [$UPLOADTOOL_SUFFIX]"
echo ""

View File

@ -4,7 +4,7 @@
# versions
# see: https://poppler.freedesktop.org/releases.html
# current working: 0.83.0
# current working: 0.89.0
export PDF2HTMLEX_VERSION=0.18.8.rc1
@ -29,6 +29,21 @@ export FONTFORGE_VERSION=20200314
#export FONTFORGE_VERSION=20190317
#export FONTFORGE_VERSION=20170731
##################################################################
# Specify a working version of linuxDeploy to build the appImage
#
# see: https://github.com/linuxdeploy/linuxdeploy/issues/142#issuecomment-669910999
#
# The following is the most up to date version of linuxdeploy:
#
#export LINUX_DEPLOY_URL=https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous
#
# The following is a recent known to work version of linuxdeploy from 2020/Aug/05
#
export LINUX_DEPLOY_URL=https://artifacts.assassinate-you.net/artifactory/list/linuxdeploy/travis-456
###################################################################
if [ -z "$PDF2HTMLEX_BRANCH" ]; then
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [ -z "$PDF2HTMLEX_BRANCH" ]; then
@ -82,3 +97,4 @@ echo "export BUILD_DIST=\"$BUILD_DIST\"" >> buildScripts/reSourc
echo "export BUILD_DATE=\"$BUILD_DATE\"" >> buildScripts/reSourceVersionEnvs
echo "export BUILD_TIME=\"$BUILD_TIME\"" >> buildScripts/reSourceVersionEnvs
echo "export PDF2HTMLEX_PREFIX=\"$PDF2HTMLEX_PREFIX\"" >> buildScripts/reSourceVersionEnvs
echo "export LINUX_DEPLOY_URL=\"$LINUX_DEPLOY_URL\"" >> buildScripts/reSourceVersionEnvs