From 72b3368b48d5a1f52ba2a607816e80ae07e1777f Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Thu, 15 Apr 2021 11:29:39 -0500 Subject: [PATCH] cicd --- .gitlab-ci.yml | 2 +- src/background.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f03b700..4a8dbe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,4 +58,4 @@ auto-release-master: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when when commits are pushed to the default branch script: - echo "Release $VERSION" - - release-cli create --name "Release $VERSION" --tag-name v$VERSION --description Release $CI_COMMIT_TITLE --ref $CI_COMMIT_SHA --assets-link '{"name":${APPNAME},"url":"${PACKAGE_REGISTRY_URL}/${PACKAGE}"}' + - release-cli create --name "Release $VERSION" --tag-name v$VERSION --description "Release $CI_COMMIT_TITLE" --ref $CI_COMMIT_SHA --assets-link '{"name":${APPNAME},"url":"${PACKAGE_REGISTRY_URL}/${PACKAGE}"}' diff --git a/src/background.ts b/src/background.ts index 2f28bb2..294c0af 100644 --- a/src/background.ts +++ b/src/background.ts @@ -27,12 +27,13 @@ const isDev = require('electron-is-dev'); type: 'info', buttons: ['Restart', 'Later'], title: 'Application Update', - message: releaseName, - detail: 'A new version has been downloaded. Restart to update.' + message: 'A new version has been downloaded. Restart to update.' } autoUpdater.on('update-downloaded', () => { - autoUpdater.quitAndInstall() + dialog.showMessageBox(dialogConfig).then((returnValue) => { + if (returnValue.response === 0) autoUpdater.quitAndInstall() + }) }) autoUpdater.checkForUpdatesAndNotify() -- 2.43.0