Skip to content

Commit

Permalink
fix: Downgrading nsis to v3.0.4.1 since v3.0.4.2 throws false virus p…
Browse files Browse the repository at this point in the history
…ositives (#6334) (#6447)
  • Loading branch information
mmaietta committed Nov 26, 2021
1 parent e95afc1 commit d20bcf0
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 20 deletions.
5 changes: 5 additions & 0 deletions .changeset/purple-swans-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-lib": patch
---

fix(nsis): downgrade nsis from v3.0.4.2 to v3.0.4.1 due to (#6334)
16 changes: 15 additions & 1 deletion packages/app-builder-lib/scheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -493,11 +493,25 @@
"description": "Repository slug/name",
"type": "string"
},
"token": {
"description": "The access token to support auto-update from private bitbucket repositories.",
"type": [
"null",
"string"
]
},
"updaterCacheDirName": {
"type": [
"null",
"string"
]
},
"username": {
"description": "The user name to support auto-update from private bitbucket repositories.",
"type": [
"null",
"string"
]
}
},
"required": [
Expand Down Expand Up @@ -525,7 +539,7 @@
]
},
"version": {
"default": "3.0.4.2",
"default": "3.0.4.1",
"type": [
"null",
"string"
Expand Down
4 changes: 2 additions & 2 deletions packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ interface CustomNsisBinary {

/**
* @private
* @default o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==
* @default VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==
*/

readonly checksum?: string | null

/**
* @private
* @default 3.0.4.2
* @default 3.0.4.1
*/

readonly version?: string | null
Expand Down
3 changes: 2 additions & 1 deletion packages/app-builder-lib/src/targets/nsis/nsisUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ export const NSIS_PATH = () => {
return getBinFromCustomLoc("nsis", binaryVersion, url, checksum)
}
}
// Warning: Don't use v3.0.4.2 - https://github.com/electron-userland/electron-builder/issues/6334
// noinspection SpellCheckingInspection
return getBinFromUrl("nsis", "3.0.4.2", "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==")
return getBinFromUrl("nsis", "3.0.4.1", "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==")
})
}

Expand Down
21 changes: 5 additions & 16 deletions test/src/windows/assistedInstallerTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,17 @@ test.ifAll.ifNotCiMac("assisted, MUI_HEADER as option", () => {
)
})

test.ifNotCiMac(
"custom makensis.exe",
test.skip.ifNotCiMac(
"debug logging enabled",
app({
targets: nsisTarget,
config: {
nsis: {
customNsisBinary: {
url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.1/nsis-3.0.4.1.7z",
version: "3.0.4.1",
checksum: "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==",
url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.2/nsis-3.0.4.2.7z",
version: "3.0.4.2",
checksum: "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==",
},
},
},
})
)

test.ifNotCiMac(
"debug logging enabled",
app({
targets: nsisTarget,
config: {
nsis: {
debugLogging: true,
},
},
Expand Down

0 comments on commit d20bcf0

Please sign in to comment.