From 5c5c9315f42ce9117ea6d82cbaa34bea82c6eb0c Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Mon, 14 Oct 2024 14:33:39 +0100 Subject: [PATCH 1/4] unpack native modules on windows --- electron-builder-publish.js | 3 ++- lib/drivers/tandem | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/electron-builder-publish.js b/electron-builder-publish.js index 554039f3f..3a67df20a 100644 --- a/electron-builder-publish.js +++ b/electron-builder-publish.js @@ -70,7 +70,8 @@ const config = { publisherName: [ 'Tidepool Project' ], - rfc3161TimeStampServer: 'http://timestamp.digicert.com' + rfc3161TimeStampServer: 'http://timestamp.digicert.com', + asarUnpack: '**\\*.node', }, mac: { category: 'public.app-category.tools', diff --git a/lib/drivers/tandem b/lib/drivers/tandem index 2b598f844..a5b753895 160000 --- a/lib/drivers/tandem +++ b/lib/drivers/tandem @@ -1 +1 @@ -Subproject commit 2b598f8446d7bd883c40f120b6cc354d964cda0b +Subproject commit a5b753895d7f16a3c952c6c08c953c828af37cb9 From 498baeb1c3d5eab78d622e15c7ca4b05c10c5d76 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Mon, 14 Oct 2024 14:34:51 +0100 Subject: [PATCH 2/4] v2.59.1-false-av.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 f6f25d569..686f540f3 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.59.1-handle-empty.4", + "version": "2.59.1-false-av.1", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/package.json b/package.json index a6e5a8b11..686572bd5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.59.1-handle-empty.4", + "version": "2.59.1-false-av.1", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", From a0d60940b50f31a22b6e2a9f14de119c680cbe07 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 10 Oct 2024 16:21:34 +0100 Subject: [PATCH 3/4] change from npm to yarn in package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 686572bd5..abdec2f0e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "start-main-dev": "cross-env HOT=1 NODE_ENV=development electron --no-sandbox -r @babel/register ./app/main.dev.js", "server": "node server", "prepare-qa-build": "node -r @babel/register scripts/prepare-qa-build.js", - "package": "npm run build-quiet && electron-builder -p always -c electron-builder-publish.js" + "package": "yarn build-quiet && electron-builder -p always -c electron-builder-publish.js" }, "dependencies": { "@electron/remote": "2.1.2", From f613c00f9a11688abb06b429cddd3ae5b4cd2938 Mon Sep 17 00:00:00 2001 From: Gerrit Niezen Date: Thu, 10 Oct 2024 15:46:00 +0100 Subject: [PATCH 4/4] bump version of nvm --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ef0c6bcc..2f58bee33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,12 +23,16 @@ jobs: name: Install nvm and node command: | set +e - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.5/install.sh | bash + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash source ~/.nvm/nvm.sh + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" nvm install v18.17.1 nvm alias default v18.17.1 - run: node -v - run: npm install --global npm node-gyp + - run: echo $SHELL - run: npm -v - run: node-gyp -v - run: curl -o- -L https://yarnpkg.com/install.sh | bash