From a866e10fc8f8a21507302d26b69c1260e3da3fff Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 14:19:52 +0100 Subject: [PATCH 1/6] Removed AppImage target --- app/builder-config-linux.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/builder-config-linux.yaml b/app/builder-config-linux.yaml index c8330a26..37f52c87 100644 --- a/app/builder-config-linux.yaml +++ b/app/builder-config-linux.yaml @@ -1,7 +1,6 @@ extends: app/builder-config-base.yaml linux: target: - - AppImage - target: deb arch: - x64 From a256f5a791beadcfff5e8fb47d85c339af7a53bb Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 14:20:07 +0100 Subject: [PATCH 2/6] Split build targets into CI jobs --- .gitlab-ci.yml | 87 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b49d9e9..b117b072 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - build + - package - deploy # Cache modules in between jobs @@ -11,21 +12,84 @@ cache: build: stage: build image: electronuserland/builder:wine - retry: 2 script: - npm install - - npm run release - - tar -czvf "./release-builds/openflexure-ev-web.tar.gz" -C "./dist" . + - npm run build + artifacts: + name: "openflexure-ev-web" + paths: + - dist/ + only: + - tags + - web + +package-raspi-deb: + stage: package + dependencies: + - build + image: electronuserland/builder:wine + retry: 2 + script: + - npm run dist:raspi + - mv ./release-builds/openflexure-ev-linux-armv7l.deb . + artifacts: + name: "openflexure-ev-linux-armv7l" + paths: + - openflexure-ev-linux-armv7l.deb + only: + - tags + - web + +package-linux-deb: + stage: package + dependencies: + - build + image: electronuserland/builder:wine + retry: 2 + script: + - npm run dist:linux + - mv ./release-builds/openflexure-ev-linux-amd64.deb . + artifacts: + name: "openflexure-ev-linux-amd64" + paths: + - openflexure-ev-linux-amd64.deb + only: + - tags + - web + +package-win32-exe: + stage: package + dependencies: + - build + image: electronuserland/builder:wine + retry: 2 + script: + - npm run dist:win + - mv ./release-builds/openflexure-ev-win.exe . + artifacts: + name: "openflexure-ev-win" + paths: + - openflexure-ev-win.exe + only: + - tags + - web + +package-win32-choco: + stage: package + dependencies: + - build + image: electronuserland/builder:wine + retry: 2 + script: - chmod +x ./app/make-nupkg.sh - ./app/make-nupkg.sh + - mv ./release-builds/choco/openflexure-ev.nuspec . + - mv ./release-builds/choco/tools . artifacts: + name: "openflexure-ev-choco-nuspec" paths: - - release-builds/*.exe - - release-builds/*.deb - - release-builds/*.AppImage - - release-builds/*.tar.gz - - release-builds/choco/openflexure-ev.nuspec - - release-builds/choco/tools/chocolateyInstall.ps1 + - openflexure-ev.nuspec + - tools/chocolateyInstall.ps1 only: - tags - web @@ -34,7 +98,7 @@ deploy: stage: deploy image: patrickhuber/choco-linux dependencies: - - build + - package-win32-choco script: - cd ./release-builds/choco - ls -R @@ -42,7 +106,8 @@ deploy: - choco apikey --key $CHOCO_API_KEY --source https://push.chocolatey.org/ - choco push --source https://push.chocolatey.org/ artifacts: + name: "openflexure-ev-choco-nupkg" paths: - release-builds/choco/*.nupkg only: - - tags + - web From cd2809d96a01beebf393808c89d0eae53396789b Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 14:52:47 +0100 Subject: [PATCH 3/6] Remove choco push from CI --- .gitlab-ci.yml | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b117b072..224c4bce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ stages: - build - package - - deploy # Cache modules in between jobs cache: @@ -9,6 +8,7 @@ cache: paths: - node_modules/ +# Build basic webapp build: stage: build image: electronuserland/builder:wine @@ -23,6 +23,7 @@ build: - tags - web + # Platform-specific Electron builds package-raspi-deb: stage: package dependencies: @@ -74,40 +75,25 @@ package-win32-exe: - tags - web +# Create a nupkg file for Choco package manager package-win32-choco: - stage: package - dependencies: - - build - image: electronuserland/builder:wine - retry: 2 + stage: build + image: patrickhuber/choco-linux script: - chmod +x ./app/make-nupkg.sh - ./app/make-nupkg.sh - - mv ./release-builds/choco/openflexure-ev.nuspec . - - mv ./release-builds/choco/tools . - artifacts: - name: "openflexure-ev-choco-nuspec" - paths: - - openflexure-ev.nuspec - - tools/chocolateyInstall.ps1 - only: - - tags - - web - -deploy: - stage: deploy - image: patrickhuber/choco-linux - dependencies: - - package-win32-choco - script: - cd ./release-builds/choco - - ls -R - choco pack - - choco apikey --key $CHOCO_API_KEY --source https://push.chocolatey.org/ - - choco push --source https://push.chocolatey.org/ + - cd ../../ + - mv ./release-builds/choco/openflexure-ev.nuspec . + - mv ./release-builds/choco/*.nupkg . + - mv ./release-builds/choco/tools . artifacts: name: "openflexure-ev-choco-nupkg" paths: - - release-builds/choco/*.nupkg + - ./openflexure-ev.nuspec + - tools/chocolateyInstall.ps1 + - ./*.nupkg only: + - tags - web From d859bd203a57d6e8e28bce1ced2fb87a98c2e0c5 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 14:54:02 +0100 Subject: [PATCH 4/6] Prevent choco pack until win32 build finished --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 224c4bce..33be43d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,6 +78,8 @@ package-win32-exe: # Create a nupkg file for Choco package manager package-win32-choco: stage: build + dependencies: + - package-win32-exe image: patrickhuber/choco-linux script: - chmod +x ./app/make-nupkg.sh From ce19199c428447c6976a9b20897c959af1ef664d Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 15:06:13 +0100 Subject: [PATCH 5/6] Renamed jobs --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33be43d8..c79fd37d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - package + - meta # Cache modules in between jobs cache: @@ -24,7 +25,7 @@ build: - web # Platform-specific Electron builds -package-raspi-deb: +package:rpi: stage: package dependencies: - build @@ -41,7 +42,7 @@ package-raspi-deb: - tags - web -package-linux-deb: +package:deb: stage: package dependencies: - build @@ -58,7 +59,7 @@ package-linux-deb: - tags - web -package-win32-exe: +package:win32: stage: package dependencies: - build @@ -76,10 +77,10 @@ package-win32-exe: - web # Create a nupkg file for Choco package manager -package-win32-choco: - stage: build +meta:choco: + stage: meta dependencies: - - package-win32-exe + - package:win32 image: patrickhuber/choco-linux script: - chmod +x ./app/make-nupkg.sh From dbdf91844b170a65e976b44131f8770a98a25813 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Tue, 14 May 2019 15:19:00 +0100 Subject: [PATCH 6/6] Iterated package version and fixed UIKit version --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fed8021b..4f335103 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openflexure-ev", - "version": "0.2.3", + "version": "0.2.5", "private": true, "description": "An electron-based user client for the OpenFlexure Microscope Server", "author": "OpenFlexure (https://www.openflexure.org)", @@ -36,7 +36,7 @@ "electron-builder": "^20.39.0", "less": "^3.9.0", "less-loader": "^4.1.0", - "uikit": "^3.1.1", + "uikit": "3.1.1", "vue": "^2.5.21", "vue-template-compiler": "^2.6.10", "vuex": "^3.0.1" @@ -54,4 +54,4 @@ "last 2 versions", "not ie <= 8" ] -} +} \ No newline at end of file