From d3f31073ad80f0195d71bc5c0c4031e0dcec99fd Mon Sep 17 00:00:00 2001 From: Daniel Constantin Date: Mon, 13 Aug 2018 08:04:03 +0300 Subject: [PATCH 1/4] Add generic provider for auto updates --- app/index.js | 2 +- package.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/index.js b/app/index.js index 92ed635..62605f2 100644 --- a/app/index.js +++ b/app/index.js @@ -149,7 +149,7 @@ function startOrion () { defaultId: 1 }) if (btnId === 1) { - shell.openExternal(`${pjson.repository}/releases/latest`) + shell.openExternal(pjson.releasePage) } }) autoUpdater.on('update-downloaded', (info) => { diff --git a/package.json b/package.json index 1bda4cf..35ace88 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "lint": "eslint app/ --ext .jsx --ext .js", "start": "electron ." }, + "releasePage": "https://orion.siderus.io", "repository": "https://github.com/siderus/Orion", "keywords": [ "electron", @@ -81,6 +82,10 @@ "testURL": "http://localhost/" }, "build": { + "publish": [{ + "provider": "generic", + "url": "https://get.siderus.io" + }], "appId": "io.siderus.orion", "files": [ "app/**/*", From 92e86bbbe19930426cdb4900c16d6b7eca1c8f50 Mon Sep 17 00:00:00 2001 From: Daniel Constantin Date: Mon, 13 Aug 2018 18:34:26 +0300 Subject: [PATCH 2/4] Fix update provider url --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35ace88..4eddd02 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "build": { "publish": [{ "provider": "generic", - "url": "https://get.siderus.io" + "url": "https://get.siderus.io/orion" }], "appId": "io.siderus.orion", "files": [ From 6b952ee19c3300d662ad424d4faf679454d858c1 Mon Sep 17 00:00:00 2001 From: Lorenzo Setale Date: Mon, 13 Aug 2018 20:08:25 +0200 Subject: [PATCH 3/4] uploads artifatcs for each stage and push it only on tags --- .gitlab-ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53a14cb..fcb3171 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,24 +69,36 @@ yarn:release:mac: retry: 2 script: - docker run --rm -e GH_TOKEN="${GH_TOKEN}" -v ${PWD}:/project electronuserland/builder:wine /bin/bash -c "make release -e OS=Darwin -e UNAME_S=Darwin" + artifacts: + paths: + - build + expire_in: 3 months only: - - master + - tags yarn:release:win: stage: release retry: 2 script: - docker run --rm -e GH_TOKEN="${GH_TOKEN}" -v ${PWD}:/project electronuserland/builder:wine /bin/bash -c "make release -e OS=Windows_NT" + artifacts: + paths: + - build + expire_in: 3 months only: - - master + - tags yarn:release:gnu: stage: release retry: 2 script: - docker run --rm -e GH_TOKEN="${GH_TOKEN}" -v ${PWD}:/project electronuserland/builder:wine /bin/bash -c "make release -e OS=Linux -e UNAME_S=Linux" + artifacts: + paths: + - build + expire_in: 3 months only: - - master + - tags trigger_repository: @@ -94,4 +106,4 @@ trigger_repository: script: - curl -X POST -F token=${TRIGGER_REPO_TOKEN} -F ref=master https://gitlab.com/api/v4/projects/7744513/trigger/pipeline only: - - master + - tags From 2515b9a38ef008469910192f7a3a2d5c9f442cb4 Mon Sep 17 00:00:00 2001 From: Lorenzo Setale Date: Mon, 13 Aug 2018 20:18:04 +0200 Subject: [PATCH 4/4] enables tests also on tags --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcb3171..9f6cbe0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ yarn:test: only: - master - /release.*/ + - tags yarn:build:mac: