From a79ee51961eb4534802b77be019653484fa06750 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Wed, 1 Jul 2020 11:48:15 +0100 Subject: [PATCH 1/9] add s3 as a provider for publishing --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index f34a8b9588..e5397d1e65 100644 --- a/package.json +++ b/package.json @@ -174,6 +174,10 @@ }, "dir" ] + }, + "publish": { + "provider": ["github", "s3"], + "bucket": "tidepool-downloads", } }, "bin": { From b728ce7ed60475bfe0f731fd189550b3669e78c5 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 2 Jul 2020 15:26:00 +0100 Subject: [PATCH 2/9] v2.31.0-build-s3.1 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 2b6b4ee39b..8c8108fcd8 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.31.0", + "version": "2.31.0-build-s3.1", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index e5397d1e65..69b687404f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.31.0", + "version": "2.31.0-build-s3.1", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", From 1d2e9897a7de75768dae1d2d8f10985134e195f5 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 2 Jul 2020 15:32:06 +0100 Subject: [PATCH 3/9] remove extra comma --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 69b687404f..9f8d6d0b0c 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,7 @@ }, "publish": { "provider": ["github", "s3"], - "bucket": "tidepool-downloads", + "bucket": "tidepool-downloads" } }, "bin": { From 0a4f8a8aa32a847318e3c7ea655082fadc04386b Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 2 Jul 2020 15:46:45 +0100 Subject: [PATCH 4/9] fix publish config --- package.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9f8d6d0b0c..5a357292ff 100644 --- a/package.json +++ b/package.json @@ -175,10 +175,13 @@ "dir" ] }, - "publish": { - "provider": ["github", "s3"], - "bucket": "tidepool-downloads" - } + "publish": [ + "github", + { + "provider": "s3", + "bucket": "tidepool-downloads" + } + ] }, "bin": { "electron": "./node_modules/.bin/electron" From 8d8328528a1cba1110216a949979e7b285182c77 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Fri, 10 Jul 2020 10:48:16 +0100 Subject: [PATCH 5/9] add env var descriptions --- README.md | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 21c91532ce..4147481461 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,12 @@ If you are running Linux you probably need to be using an Ubuntu distribution or 1. Build the image - `docker-compose build` - + `docker-compose build` + 2. Run it - `docker-compose up -d` + `docker-compose up -d` -3. Work with it interactively. +3. Work with it interactively. Even if you kill the Tidepool Uploader GUI the container will continue to run. You can work with the yarn commands like you would locally by using docker exec. @@ -135,6 +135,25 @@ For a non-production release (alpha, dev, etc.) The Uploader has a self-update mechanism that will look at the latest release and compare versions, downloading and prompting the user to update if a newer version is available. For production releases, only official releases will be considered. For non-production releases (`-alpha`, `-beta.2`, etc.) releases marked as `pre-release` will also be checked, matching against the string portion of the post-hyphen version segment. For more detail about this behavior see [the electron-builder docs concerning auto-update options]( https://github.com/electron-userland/electron-builder/wiki/Auto-Update#appupdater--internaleventemitter) +### CI server environment variables + +We use the following environment variables on the CI servers: + +| Variable | CI Server | Use | +|----------|-----------|-------| +| APPLEID | CircleCI | Notarization | +| APPLEIDPASS | CircleCI | Notarization | +| AWS_ACCESS_KEY_ID | Both | S3 builds and AV e-mails | +| AWS_SECRET_ACESS_KEY | Both | S3 builds and AV e-mails | +| CSC_FOR_PULL_REQUEST | Both | `true`, code signing for PR | +| CSC_KEY_PASSWORD | Both | Certificate password | +| CSC_LINK | Both | Code signing certificate | +| DEBUG | CircleCI | Set to `electron-builder` | +| GH_TOKEN | Both | For GitHub builds | +| PUBLISH_FOR_PULL_REQUEST | Both | `true`, build artefact for PR | +| ROLLBAR_POST_TOKEN | Both | Rollbar logging | +| FTP_AV_PASSWORD_TIDEPOOL | Appveyor | AV submission | + ## Editor Configuration **Atom** ```bash From d4b05a942d1b3beef1d115a2f9ab8d6e31d1bf0f Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Tue, 21 Jul 2020 13:34:11 +0100 Subject: [PATCH 6/9] udpate S3 bucket name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b172ada56f..2cb9b7b3ce 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "github", { "provider": "s3", - "bucket": "tidepool-downloads" + "bucket": "downloads.tidepool.org" } ] }, From 74602e4db1ddf361ec9d981e6be570fa7d5db43e Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Tue, 21 Jul 2020 13:35:30 +0100 Subject: [PATCH 7/9] v2.31.0-build-s3.2 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 8c8108fcd8..799120fd96 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.31.0-build-s3.1", + "version": "2.31.0-build-s3.2", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index 2cb9b7b3ce..f8c61aee09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.31.0-build-s3.1", + "version": "2.31.0-build-s3.2", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", From ea4f43ad6821a66f6d526713ab94e44412ee88f4 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Tue, 21 Jul 2020 14:44:07 +0100 Subject: [PATCH 8/9] v2.31.0-build-s3.3 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 799120fd96..05c736dabd 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.31.0-build-s3.2", + "version": "2.31.0-build-s3.3", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index f8c61aee09..f98514b12c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.31.0-build-s3.2", + "version": "2.31.0-build-s3.3", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", From 639ecda1d4fdb2327518825126069a53540a079f Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Tue, 28 Jul 2020 16:41:20 +0100 Subject: [PATCH 9/9] removing test suffix --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index bba763c1fb..89457a30a5 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.32.0-build-s3.3", + "version": "2.32.0", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index b5d1168603..0638195a0e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.32.0-build-s3.3", + "version": "2.32.0", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js",