cicd

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe8056b435b292238cabe1cc2e8222b27dd674f8..2adb652bfff0fe53a7687c24076d38a1bc6d8178 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 
 build:
   stage: Build
-  image: electronuserland/builder:wine
+  image: electronuserland/builder
   before_script:
     - yarn
   script:
@@ -25,7 +25,7 @@ build:
     - main
 
 variables:
-  WIN_BINARY: '${APPNAME}-${VERSION}.exe'
+  BINARY: '${APPNAME}-${VERSION}.exe'
   PACKAGE_REGISTRY_URL: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${APPNAME}/${VERSION}'
 
 upload:
@@ -38,7 +38,7 @@ upload:
       when: never # Do not run this job when a tag is created manually
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when when commits are pushed to the default branch
   script:
-    - 'curl --header "JOB-TOKEN: $CI_DEPLOY_PASSWORD" --upload-file "./dist/${WIN_BINARY}" "${PACKAGE_REGISTRY_URL}/${WIN_BINARY}"'
+    - 'curl --header "JOB-TOKEN: $CI_DEPLOY_PASSWORD" --upload-file "./dist/${BINARY}" "${PACKAGE_REGISTRY_URL}/${BINARY}"'
 
 auto-release-master:
   image: registry.gitlab.com/gitlab-org/release-cli
@@ -57,4 +57,4 @@ auto-release-master:
     - |
       release-cli create --name "Release $VERSION" --tag-name v$VERSION \
       --description 'Created using the release-cli. $CI_COMMIT_TITLE' --ref $CI_COMMIT_SHA \
-      --assets-link "{\"name\":\"${APPNAME}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_BINARY}\"}"
+      --assets-link "{\"name\":\"${APPNAME}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${BINARY}\"}"

diff --git a/src/background.ts b/src/background.ts
index 95db12be533f975cc9a7ae9aef4b20ac5548a8d3..77e704c5ddb2f73a8c3bf2f2397f0a3c526c16c1 100644 (file)
--- a/src/background.ts
+++ b/src/background.ts
@@ -21,16 +21,18 @@ const isDev = require('electron-is-dev');
 
 // NOTE Program Begins Here
 (async () => {
-    
+
     autoUpdater.requestHeaders = { 'PRIVATE-TOKEN': 'seMF_apn237iUw8puG9a' }
     autoUpdater.logger = log;
 
-    // Check for updates right away.
+    autoUpdater.on('update-downloaded', () => {
+        autoUpdater.quitAndInstall()
+    })
+
     autoUpdater.checkForUpdatesAndNotify()
 
-    // Then, every two minuntes...
     setInterval(() => {
-      autoUpdater.checkForUpdatesAndNotify()
+        autoUpdater.checkForUpdatesAndNotify()
     }, 120000)
 
     console.log('Starting Crimata electron app.');

diff --git a/yarn.lock b/yarn.lock
index 76ed0cc8c41e27946966fac3d4e6cc87d85df0f7..e89e34a2828d5d65fc5868b2fddda13f2acfb240 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -1391,11 +1391,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/electron-devtools-installer@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@types/electron-devtools-installer/-/electron-devtools-installer-2.2.0.tgz#32ee4ebbe99b3daf9847a6d2097dc00b5de94f10"
-  integrity sha512-HJNxpaOXuykCK4rQ6FOMxAA0NLFYsf7FiPFGmab0iQmtVBHSAfxzy3MRFpLTTDDWbV0yD2YsHOQvdu8yCqtCfw==
-
 "@types/eslint-visitor-keys@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
@@ -12999,7 +12994,7 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue-cli-plugin-electron-builder@~2.0.0-rc.6:
+vue-cli-plugin-electron-builder@~2.0.0-rc.4:
   version "2.0.0-rc.6"
   resolved "https://registry.yarnpkg.com/vue-cli-plugin-electron-builder/-/vue-cli-plugin-electron-builder-2.0.0-rc.6.tgz#2c0df46167ef50c71923cf47836bb7e4f6685c29"
   integrity sha512-VDpPwdGZ5qoEZe5DuPmyvDB8Ip/CyarpA9cWnEWNJcZ/2NajnglirMCa6cbLrwt9vsv6HFa28IsmVtaVu4dFqw==