status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use StatusImAppImage package without redundant files 

Signed-off-by: Max Risuhin <risuhin.max@gmail.com>
This commit is contained in:
Max Risuhin 2018-12-09 15:59:42 +02:00
parent aea75a2de0
commit 8f0bfde759
No known key found for this signature in database
GPG Key ID: BF733F5ACA0B4448
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/Jenkinsfile.linux
View File

@ -9,7 +9,7 @@ pipeline {
"-v /dev/fuse:/dev/fuse "+ "-v /dev/fuse:/dev/fuse "+
"-v /var/tmp/lein:/var/tmp/lein:rw "+ "-v /var/tmp/lein:/var/tmp/lein:rw "+
"-v /var/tmp/npm:/var/tmp/npm:rw "+ "-v /var/tmp/npm:/var/tmp/npm:rw "+
"-v /opt/StatusImAppImage_20181113.zip:/opt/StatusImAppImage.zip:ro" "-v /opt/desktop-files:/opt/desktop-files:rw"
) )
} }
} }
@ -39,7 +39,7 @@ pipeline {
NPM_CONFIG_CACHE = '/var/tmp/npm' NPM_CONFIG_CACHE = '/var/tmp/npm'
LEIN_HOME = '/var/tmp/lein' LEIN_HOME = '/var/tmp/lein'
QT_PATH = '/opt/qt' QT_PATH = '/opt/qt'
STATUSIM_APPIMAGE = '/opt/StatusImAppImage.zip' STATUSIM_APPIMAGE_DIR = '/opt/desktop-files'
} }
stages { stages {

10
scripts/build-desktop.sh
View File

@ -73,6 +73,7 @@ STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)"
WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')" WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')"
DEPLOYQT="$(joinPath . 'linuxdeployqt-continuous-x86_64.AppImage')" DEPLOYQT="$(joinPath . 'linuxdeployqt-continuous-x86_64.AppImage')"
APPIMAGETOOL="$(joinPath . 'appimagetool-x86_64.AppImage')" APPIMAGETOOL="$(joinPath . 'appimagetool-x86_64.AppImage')"
STATUSIM_APPIMAGE_ARCHIVE="StatusImAppImage_20181208.zip"
function init() { function init() {
if [ -z $STATUSREACTPATH ]; then if [ -z $STATUSREACTPATH ]; then
@ -270,14 +271,15 @@ function bundleLinux() {
# invoke linuxdeployqt to create Status.AppImage # invoke linuxdeployqt to create Status.AppImage
echo "Creating AppImage..." echo "Creating AppImage..."
pushd $WORKFOLDER pushd $WORKFOLDER
rm -rf StatusImAppImage* rm -rf StatusImAppImage*
# TODO this needs to be fixed: status-react/issues/5378 # TODO this needs to be fixed: status-react/issues/5378
if [ -z $STATUSIM_APPIMAGE ]; then if [ -z $STATUSIM_APPIMAGE_DIR ]; then
STATUSIM_APPIMAGE=./StatusImAppImage.zip STATUSIM_APPIMAGE="./${STATUSIM_APPIMAGE_ARCHIVE}"
[ -f $STATUSIM_APPIMAGE ] || wget https://desktop-app-files.ams3.digitaloceanspaces.com/StatusImAppImage_20181113.zip -O StatusImAppImage.zip else
STATUSIM_APPIMAGE="${STATUSIM_APPIMAGE_DIR}/${STATUSIM_APPIMAGE_ARCHIVE}"
fi fi
[ -f $STATUSIM_APPIMAGE ] || wget "https://desktop-app-files.ams3.digitaloceanspaces.com/${STATUSIM_APPIMAGE_ARCHIVE}" -O $STATUSIM_APPIMAGE
unzip "$STATUSIM_APPIMAGE" -d . unzip "$STATUSIM_APPIMAGE" -d .
rm -rf AppDir rm -rf AppDir
mkdir AppDir mkdir AppDir