Skip to content
Draft
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7161ff0
tmp save
mmaietta Feb 23, 2025
fa3a7f8
everything builds
mmaietta Feb 23, 2025
3fb49c9
convert to SnapBuilderOptions
mmaietta Feb 23, 2025
35f363d
everything builds
mmaietta Feb 23, 2025
cc6bf7e
add more helpers
mmaietta Feb 23, 2025
5cf634e
cleanup
mmaietta Feb 23, 2025
78eacf3
snap tests pass
mmaietta Feb 23, 2025
5dbbb3e
cleanup?
mmaietta Feb 23, 2025
d76121e
Merge commit 'e4d51475676819fc1c92f43b954171b1154d3290' into snap-js-…
mmaietta Feb 23, 2025
16b347e
clean up part 1
mmaietta Feb 23, 2025
cbb2a27
cleanup 3
mmaietta Feb 23, 2025
742a0fc
cleanup 4
mmaietta Feb 23, 2025
6ee53b0
cleanup 5
mmaietta Feb 23, 2025
2a68308
Merge branch 'master' into snap-js-migration
mmaietta Feb 23, 2025
aff2805
move snap tests to macos so that we can install snapcraft and multipass
mmaietta Feb 23, 2025
3f79884
move back to linux runner
mmaietta Feb 23, 2025
0be7bbd
test running snaptest on ubuntu runner?
mmaietta Feb 24, 2025
4690ae4
add sudo
mmaietta Feb 24, 2025
5a9c9c3
run in band
mmaietta Feb 24, 2025
8bdb942
multipass parallel?
mmaietta Feb 24, 2025
58051ac
only skip multipass tests
mmaietta Feb 24, 2025
db11629
update snapshots
mmaietta Feb 24, 2025
5eb372b
run all tests and update snapshots
mmaietta Feb 24, 2025
e7e3468
Merge branch 'master' into snap-js-migration
mmaietta Feb 25, 2025
34fcff6
cleanup
mmaietta Feb 25, 2025
0d7981c
add snapHeavyTest to GH runner
mmaietta Feb 25, 2025
3409ede
guess we cant run snapHeavyTest on GH runner due to multipass being u…
mmaietta Feb 25, 2025
873106f
Create empty-files-itch.md
mmaietta Feb 25, 2025
f30c812
Merge branch 'master' into snap-js-migration
mmaietta Feb 25, 2025
249790b
Merge commit '67b6f71f85798dba4ce51dfb2cd012e04cd391db' into snap-js-…
mmaietta Feb 25, 2025
00158e7
pr feedback
mmaietta Feb 26, 2025
de61d2a
Merge branch 'master' into snap-js-migration
mmaietta Feb 26, 2025
44325b9
convert `chmod -R` to `await chmod`
mmaietta Feb 26, 2025
8197563
update warning message
mmaietta Feb 27, 2025
ac96cb8
move templates to `template` dir
mmaietta Feb 27, 2025
fde0731
read files instead of byte string and refactor
mmaietta Feb 27, 2025
5cd59d4
add more snapshots because why not
mmaietta Feb 28, 2025
f0a9c3b
Merge branch 'master' into snap-js-migration
mmaietta Mar 3, 2025
aef891c
Merge branch 'master' into snap-js-migration
beyondkmp Mar 5, 2025
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
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"console": "integratedTerminal",
"internalConsoleOptions": "openOnFirstSessionStart",
"env": {
"TEST_FILES": "BuildTest"
"TEST_FILES": "snapTest"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions packages/app-builder-lib/src/binDownload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function getBinFromCustomLoc(name: string, version: string, binariesLocUr
return getBin(dirName, binariesLocUrl, checksum)
}

export function getBinFromUrl(name: string, version: string, checksum: string): Promise<string> {
export function getBinFromUrl(name: string, version: string, checksum: string, fileName = `${name}-${version}`): Promise<string> {
const dirName = `${name}-${version}`
let url: string
if (process.env.ELECTRON_BUILDER_BINARIES_DOWNLOAD_OVERRIDE_URL) {
Expand All @@ -34,7 +34,7 @@ export function getBinFromUrl(name: string, version: string, checksum: string):
process.env.npm_package_config_electron_builder_binaries_custom_dir ||
process.env.ELECTRON_BUILDER_BINARIES_CUSTOM_DIR ||
dirName
const urlSuffix = dirName + ".7z"
const urlSuffix = fileName + ".7z"
url = `${baseUrl}${middleUrl}/${urlSuffix}`
}

Expand Down
4 changes: 2 additions & 2 deletions packages/app-builder-lib/src/linuxPackager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import AppImageTarget from "./targets/AppImageTarget"
import FlatpakTarget from "./targets/FlatpakTarget"
import FpmTarget from "./targets/FpmTarget"
import { LinuxTargetHelper } from "./targets/LinuxTargetHelper"
import SnapTarget from "./targets/snap"
import SnapTarget from "./targets/snap/snap"
import { createCommonTarget } from "./targets/targetFactory"

export class LinuxPackager extends PlatformPackager<LinuxConfiguration> {
Expand Down Expand Up @@ -44,7 +44,7 @@ export class LinuxPackager extends PlatformPackager<LinuxConfiguration> {
case "appimage":
return require("./targets/AppImageTarget").default
case "snap":
return require("./targets/snap").default
return require("./targets/snap/snap").default
case "flatpak":
return require("./targets/FlatpakTarget").default
case "deb":
Expand Down
Loading
Loading