From dbac579017900ed42a396b7da5751df27e6c917f Mon Sep 17 00:00:00 2001 From: Maja Date: Mon, 1 Apr 2024 16:01:09 +0200 Subject: [PATCH 01/10] chore: use probe-cli@v3.21.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2298acbb..7cf78d5e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", "version": "3.9.4", - "probeVersion": "3.20.1", + "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", "repository": "ooni/probe-desktop", From 3a127f6f34069d8d01771829ad44d128be4fcf7f Mon Sep 17 00:00:00 2001 From: Maja Komel Date: Tue, 2 Apr 2024 19:14:22 +0200 Subject: [PATCH 02/10] Bump version to 3.9.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7cf78d5e..3c87bf0f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.4", + "version": "3.9.5-rc.1", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", From ea71d1e57141d168b28558bf409a81c77a6c0ec4 Mon Sep 17 00:00:00 2001 From: Maja Komel Date: Wed, 3 Apr 2024 09:37:28 +0200 Subject: [PATCH 03/10] Bump version to 3.9.5-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c87bf0f..28588d1d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.5-rc.1", + "version": "3.9.5-rc.2", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", From 7e7b7c0c8923e9af53c72d48ccb60e32a45ef084 Mon Sep 17 00:00:00 2001 From: majakomel Date: Wed, 3 Apr 2024 13:22:31 +0200 Subject: [PATCH 04/10] Add electron builder requirements --- electron-builder-requirements.txt | 1 + package.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 electron-builder-requirements.txt diff --git a/electron-builder-requirements.txt b/electron-builder-requirements.txt new file mode 100644 index 00000000..51d7ef83 --- /dev/null +++ b/electron-builder-requirements.txt @@ -0,0 +1 @@ +designated => anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = YWCG8FZTLT or anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = TT53HD8N84 \ No newline at end of file diff --git a/package.json b/package.json index 28588d1d..c1ffa029 100644 --- a/package.json +++ b/package.json @@ -131,6 +131,7 @@ "entitlementsInherit": "./build/entitlements.mac.inherit.plist", "category": "public.app-category.tools", "icon": "build/icons/app.icns", + "requirements": "electron-builder-requirements.txt", "extraResources": [ { "from": "./build/probe-cli/darwin_amd64/ooniprobe", From 22b0a4673ed1ebfaf56e06a006de1f85ca481ed9 Mon Sep 17 00:00:00 2001 From: Maja Komel Date: Wed, 3 Apr 2024 13:39:14 +0200 Subject: [PATCH 05/10] Buump version to 3.9.5-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1ffa029..13fb2b0e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.5-rc.2", + "version": "3.9.5-rc.3", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", From f2f26a83822235e00b83fd7d30a3f9632199c5da Mon Sep 17 00:00:00 2001 From: majakomel Date: Wed, 3 Apr 2024 15:19:22 +0200 Subject: [PATCH 06/10] Update designated requirements --- electron-builder-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron-builder-requirements.txt b/electron-builder-requirements.txt index 51d7ef83..e886bb32 100644 --- a/electron-builder-requirements.txt +++ b/electron-builder-requirements.txt @@ -1 +1 @@ -designated => anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = YWCG8FZTLT or anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = TT53HD8N84 \ No newline at end of file +designated => anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and ( certificate leaf[subject.OU] = "YWCG8FZTLT" or certificate leaf[subject.OU] = "TT53HD8N84" ) \ No newline at end of file From 97026797a6efeccc8e7a84d1e1819c31b6a92ea9 Mon Sep 17 00:00:00 2001 From: Maja Komel Date: Wed, 3 Apr 2024 15:25:50 +0200 Subject: [PATCH 07/10] Bump to 3.9.5-rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13fb2b0e..681d4c7d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.5-rc.3", + "version": "3.9.5-rc.4", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", From 1f8b116361c122b60eadb3285221e36b8ae4a6cb Mon Sep 17 00:00:00 2001 From: majakomel Date: Tue, 9 Apr 2024 10:58:56 +0200 Subject: [PATCH 08/10] Add win publisherName --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 681d4c7d..ccad4078 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,10 @@ ] }, "win": { + "publisherName": [ + "ASSOCIAZIONE HERMES", + "Open Observatory of Network Interference (OONI)" + ], "target": [ "nsis" ], From 80c00b42082251ebf5b2a853939d1366d6f0dceb Mon Sep 17 00:00:00 2001 From: majakomel Date: Tue, 9 Apr 2024 11:00:08 +0200 Subject: [PATCH 09/10] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ccad4078..c17cbffb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.5-rc.4", + "version": "3.9.5-rc.5", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause", From e2b2b78d834f620496001ac23ae8db328f53ee6a Mon Sep 17 00:00:00 2001 From: majakomel Date: Tue, 9 Apr 2024 11:25:13 +0200 Subject: [PATCH 10/10] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c17cbffb..db26cca6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "OONI Probe Desktop app", "author": "Open Observatory of Network Interference (OONI) ", "productName": "OONI Probe", - "version": "3.9.5-rc.5", + "version": "3.9.5", "probeVersion": "3.21.0", "main": "main/index.js", "license": "BSD-3-Clause",