Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc2ec4ca

Browse files
committed
fixed problems with linuxdeploy which were stopping normal testing
1 parent06a8f7b commitc2ec4ca

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

‎buildScripts/createAppImage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ cd ../imageBuild
5353

5454
LINUX_DEPLOY_APP_IMAGE=linuxdeploy-$MACHINE_ARCH.AppImage
5555

56-
wgethttps://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LINUX_DEPLOY_APP_IMAGE
56+
wget$LINUX_DEPLOY_URL/$LINUX_DEPLOY_APP_IMAGE
5757

5858
chmod a+x$LINUX_DEPLOY_APP_IMAGE
5959

‎buildScripts/reportEnvs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,32 @@
55
# source ./buildScripts/reSourceVersionEnvs
66
. ./buildScripts/reSourceVersionEnvs
77

8+
echo""
89
echo"TravisCI env:"
910
echo" dist: [$TRAVIS_DIST]"
1011
echo" tag: [$TRAVIS_TAG]"
1112
echo" branch: [$TRAVIS_BRANCH]"
1213
echo" commit: [$TRAVIS_COMMIT]"
1314
echo" build dir: [$TRAVIS_BUILD_DIR]"
1415
echo" repo slug: [$TRAVIS_REPO_SLUG]"
16+
echo""
1517

1618
echo"Build env:"
1719
echo" prefix: [$PDF2HTMLEX_PREFIX]"
1820
echo" unattended: [$UNATTENDED]"
1921
echo" make parallel: [$MAKE_PARALLEL]"
2022
echo" OS: [$BUILD_OS]"
2123
echo" distribution: [$BUILD_DIST]"
24+
echo" linuxdeploy url: [$LINUX_DEPLOY_URL]"
25+
echo""
2226

2327
echo"pdf2htmlEX env:"
2428
echo" version: [$PDF2HTMLEX_VERSION]"
2529
echo" poppler: [$POPPLER_VERSION]"
2630
echo" fontforge: [$FONTFORGE_VERSION]"
2731
echo" pdf2htmlEX: [$PDF2HTMLEX_BRANCH]"
2832
echo" machine arch: [$MACHINE_ARCH]"
33+
echo""
2934

3035
echo"release env:"
3136
echo" build date: [$BUILD_DATE]"
@@ -35,3 +40,4 @@ echo " container name: [$CONTAINER_NAME]"
3540
echo" appImage name: [$APPIMAGE_NAME]"
3641
echo" dpkg name: [$DPKG_NAME]"
3742
echo"uploadTool suffix: [$UPLOADTOOL_SUFFIX]"
43+
echo""

‎buildScripts/versionEnvs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# versions
55

66
# see: https://poppler.freedesktop.org/releases.html
7-
# current working: 0.83.0
7+
# current working: 0.89.0
88

99
export PDF2HTMLEX_VERSION=0.18.8.rc1
1010

@@ -29,6 +29,21 @@ export FONTFORGE_VERSION=20200314
2929
#export FONTFORGE_VERSION=20190317
3030
#export FONTFORGE_VERSION=20170731
3131

32+
##################################################################
33+
# Specify a working version of linuxDeploy to build the appImage
34+
#
35+
# see: https://github.com/linuxdeploy/linuxdeploy/issues/142#issuecomment-669910999
36+
#
37+
# The following is the most up to date version of linuxdeploy:
38+
#
39+
#export LINUX_DEPLOY_URL=https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous
40+
#
41+
# The following is a recent known to work version of linuxdeploy from 2020/Aug/05
42+
#
43+
export LINUX_DEPLOY_URL=https://artifacts.assassinate-you.net/artifactory/list/linuxdeploy/travis-456
44+
45+
###################################################################
46+
3247
if [-z"$PDF2HTMLEX_BRANCH" ];then
3348
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
3449
if [-z"$PDF2HTMLEX_BRANCH" ];then
@@ -82,3 +97,4 @@ echo "export BUILD_DIST=\"$BUILD_DIST\"" >> buildScripts/reSourc
8297
echo"export BUILD_DATE=\"$BUILD_DATE\"">> buildScripts/reSourceVersionEnvs
8398
echo"export BUILD_TIME=\"$BUILD_TIME\"">> buildScripts/reSourceVersionEnvs
8499
echo"export PDF2HTMLEX_PREFIX=\"$PDF2HTMLEX_PREFIX\"">> buildScripts/reSourceVersionEnvs
100+
echo"export LINUX_DEPLOY_URL=\"$LINUX_DEPLOY_URL\"">> buildScripts/reSourceVersionEnvs

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp