diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73d680d7..fab77549 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,20 @@ build: only: - stable - tags + +build-nightly: + stage: build + image: electronuserland/builder:wine + script: + - npm install + - npm run build:web + artifacts: + expire_in: 1 week + name: "build" + paths: + - dist/ + only: + - schedules - web # Electron app build @@ -50,6 +64,24 @@ package: only: - stable - tags + +package-nightly: + stage: build + image: electronuserland/builder:wine + script: + - npm install + - npm run build:app + - npm run release + - mv ./release-builds/*.AppImage . + - mv ./release-builds/*.exe . + artifacts: + expire_in: 1 week + name: "dist" + paths: + - "*.AppImage" + - "*.exe" + only: + - schedules - web # Create a nupkg file for Choco package manager diff --git a/app/make-nupkg.sh b/app/make-nupkg.sh index f52ec90c..2923da67 100644 --- a/app/make-nupkg.sh +++ b/app/make-nupkg.sh @@ -69,7 +69,7 @@ cat > "$outpath/openflexure-ev.nuspec" <<- EOL openflexure microscope ev https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/LICENSE false - https://build.openflexure.org/openflexure_ev/512x512.png + https://glcdn.githack.com/openflexure/openflexure-microscope-jsclient/raw/v1.1.0/app/icons/png/512x512.png diff --git a/package.json b/package.json index d57b9dee..d43df844 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openflexure-ev", - "version": "1.1.0", + "version": "1.1.1", "private": true, "description": "An electron-based user client for the OpenFlexure Microscope Server", "author": "OpenFlexure (https://www.openflexure.org)", diff --git a/src/components/controlComponents/paneCapture.vue b/src/components/controlComponents/paneCapture.vue index f047231f..b5b7e06b 100644 --- a/src/components/controlComponents/paneCapture.vue +++ b/src/components/controlComponents/paneCapture.vue @@ -59,7 +59,9 @@
    -
  • + + +
  • Stack and Scan
    diff --git a/src/components/controlComponents/paneConnect.vue b/src/components/controlComponents/paneConnect.vue index 9eb1e0ca..076f3fb5 100644 --- a/src/components/controlComponents/paneConnect.vue +++ b/src/components/controlComponents/paneConnect.vue @@ -69,6 +69,7 @@