Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use electron-winstaller instead of self module #8344

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
87eb7bf
use electron-winstaller
Jul 17, 2024
3a0d1f5
fix ut
Jul 17, 2024
d209266
add nuspecTemplate
Jul 17, 2024
182eea7
custom template.nuspectemplat
Jul 17, 2024
b65450d
add patch for electron-winstaller: change exe to producname
Jul 17, 2024
272b4c8
update wine docker config
Jul 17, 2024
8910083
update snap
Jul 17, 2024
62c9bb5
update snap
Jul 17, 2024
e2d54ff
update wine docker
Jul 17, 2024
74316e3
update dockerfile
Jul 17, 2024
9f1a99a
update dockerimage
Jul 17, 2024
fd017b7
add appId and exe options
Jul 18, 2024
4202527
delete patch
Jul 18, 2024
5170902
change encode
Jul 18, 2024
a4a2f50
update 7zip
Jul 20, 2024
5ffdffd
use electron-squirrel-winstaller@1.0.2: update 7zip and nuget
Jul 20, 2024
8e5b9d2
update electron-squirrel-winstaller@1.0.3
Jul 20, 2024
6376b95
delete decompress-zip
Jul 20, 2024
006d3cb
remove directory
Jul 20, 2024
8c960cb
delete directory
Jul 20, 2024
b0e6941
update docker file
Jul 20, 2024
4bc85f2
update wine docker config
Jul 20, 2024
463c687
add vender path
Jul 21, 2024
4e5502d
change to getBin
Jul 21, 2024
d9459d9
add sign option
Jul 21, 2024
61c79cb
add shouldSign function
Jul 21, 2024
4d9cb0a
change shouldSign to async/await
Jul 21, 2024
232a90d
add template.nuspectemplate into files
beyondkmp Jul 22, 2024
b26c7a8
add vendorDirectory option
Jul 25, 2024
a5d6bee
Merge branch 'master' into win-installer
Jul 25, 2024
d36fefd
update 7zip arch
Jul 25, 2024
04c50fd
fix 7zip arch
Jul 26, 2024
2fb5700
fix name
Jul 26, 2024
023559f
Merge branch 'master' into win-installer
beyondkmp Nov 1, 2024
253c3aa
delete docker config
beyondkmp Nov 1, 2024
b7ff107
Merge branch 'master' into win-installer
beyondkmp Nov 1, 2024
10931d5
Merge branch 'master' into win-installer
beyondkmp Nov 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove directory
  • Loading branch information
beyondkmp committed Jul 20, 2024
commit 006d3cb7ed4dfa5aa7a9d3a76001e7e65cef5086
10 changes: 0 additions & 10 deletions test/snapshots/filesTest.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ Object {

exports[`extraResources on Windows 2`] = `
Array [
"lib/",
"lib/net45/",
"lib/net45/chrome_100_percent.pak",
"lib/net45/chrome_200_percent.pak",
"lib/net45/d3dcompiler_47.dll",
Expand All @@ -57,25 +55,17 @@ Array [
"lib/net45/vk_swiftshader_icd.json",
"lib/net45/vulkan-1.dll",
"lib/net45/locales/en-US.pak",
"lib/net45/resources/",
"lib/net45/resources/app.asar",
"lib/net45/resources/platformSpecificR",
"lib/net45/resources/bar/",
"lib/net45/resources/bar/hello.txt",
"lib/net45/resources/bar/x64.txt",
"lib/net45/resources/dir-relative/",
"lib/net45/resources/dir-relative/f.txt",
"lib/net45/resources/foo/",
"lib/net45/resources/foo/nameWithoutDot",
"lib/net45/resources/win/",
"lib/net45/resources/win/x64.txt",
"package/",
"package/services/",
"package/services/metadata/",
"package/services/metadata/core-properties/",
"TestApp.nuspec",
"[Content_Types].xml",
"_rels/",
"_rels/.rels",
]
`;
Expand Down
18 changes: 13 additions & 5 deletions test/src/helpers/packTester.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,19 @@ async function listNupkgContents(nupkgPath: string) {
console.error("7z command error:", stderr)
}

const files = stdout
.split("\n")
.filter((line: string) => line.startsWith("Path = "))
.map((line: string) => line.replace("Path = ", "").trim())
.filter((path: string) => path !== "")
const lines = stdout.split("\n")
const files = []

for (let i = 0; i < lines.length; i++) {
if (lines[i].startsWith("Path = ")) {
const path = lines[i].replace("Path = ", "").trim()
const nextLine = lines[i + 1]
if (nextLine && nextLine.startsWith("Folder = -")) {
files.push(path)
}
}
}

return files
} catch (error) {
throw new Error(`run 7z failed: ${error}`)
Expand Down
Loading