From be6546d7698dd66c0a61c1782ad8c33a791642c5 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 28 Mar 2018 15:20:45 +0200 Subject: [PATCH 1/3] Add npm run dist to Jenkinsfie --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 07ac88d875..b8e1008c55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -102,9 +102,15 @@ node('lisk-hub') { npm run --silent build:testnet rsync -axl --delete --rsync-path="mkdir -p /var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/ && rsync" $WORKSPACE/app/build/ jenkins@master-01:/var/www/test/${JOB_NAME%/*}/$BRANCH_NAME/ npm run --silent bundlesize + if [ -z $CHANGE_BRANCH ]; then + USE_SYSTEM_XORRISO=true npm run dist + else + echo "Skipping desktop build for Linux because we're not on 'development' branch" + fi ''' archiveArtifacts artifacts: 'app/build/' archiveArtifacts artifacts: 'app/build-testnet/' + archiveArtifacts artifacts: 'dist/lisk-hub*' githubNotify context: 'Jenkins test deployment', description: 'Commit was deployed to test', status: 'SUCCESS', targetUrl: "${HUDSON_URL}test/" + "${JOB_NAME}".tokenize('/')[0] + "/${BRANCH_NAME}" } catch (err) { echo "Error: ${err}" From 147d27563438850b5422814524a98b2019b38ba0 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 28 Mar 2018 16:29:46 +0200 Subject: [PATCH 2/3] Limit amount of Linux build targets --- package.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 55a9c9757e..144b9dfb03 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "analyze-bundles": "webpack --config ./config/webpack.config.analyze", "test-live": "npm test -- --auto-watch --no-single-run", "start": "electron ./app/", - "dist": "build --ia32 --x64 --armv7l --publish onTag", + "dist": "build --ia32 --x64 --publish onTag", "dist:win": "build --win --ia32 --x64 --publish onTag", "dist:mac": "build --mac", "dist:linux": "build --linux --ia32 --x64 --armv7l", @@ -196,10 +196,7 @@ ], "linux": { "target": [ - "AppImage", - "deb", - "rpm", - "tar.gz" + "AppImage" ], "desktop": { "MimeType": "application/lisk;x-scheme-handler/lisk" From d89d13acd6ddecb7c38e5c6700ae2e78acbbf413 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 28 Mar 2018 17:25:06 +0200 Subject: [PATCH 3/3] Allow empty artifacts of Linux build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b8e1008c55..a517ae62c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ node('lisk-hub') { ''' archiveArtifacts artifacts: 'app/build/' archiveArtifacts artifacts: 'app/build-testnet/' - archiveArtifacts artifacts: 'dist/lisk-hub*' + archiveArtifacts allowEmptyArchive: true, artifacts: 'dist/lisk-hub*' githubNotify context: 'Jenkins test deployment', description: 'Commit was deployed to test', status: 'SUCCESS', targetUrl: "${HUDSON_URL}test/" + "${JOB_NAME}".tokenize('/')[0] + "/${BRANCH_NAME}" } catch (err) { echo "Error: ${err}"