Skip to content

Commit

Permalink
Fix: Downgrading app-builder-bin in an attempt to resolve #6678
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaietta committed Mar 5, 2022
1 parent 6fcd477 commit 2e4e179
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 27 deletions.
5 changes: 5 additions & 0 deletions .changeset/eleven-cycles-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"builder-util": patch
---

Fix: Downgrading app-builder-bin in an attempt to resolve #6678
2 changes: 1 addition & 1 deletion docs/configuration/snap.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The top-level [snap](configuration.md#Configuration-snap) key contains set of op
<p><code id="SnapOptions-title">title</code> String | “undefined” - An optional title for the snap, may contain uppercase letters and spaces. Defaults to <code>productName</code>. See <a href="https://snapcraft.io/docs/snap-format">snap format documentation</a>.</p>
</li>
<li>
<p><code id="SnapOptions-compression">compression</code> = <code>lzo</code> “xz” | “lzo” | “undefined” - Sets the compression type for the snap. Can be xz or lzo. Defaults to lzo when not specified.</p>
<p><code id="SnapOptions-compression">compression</code> “xz” | “lzo” | “undefined” - Sets the compression type for the snap. Can be xz, lzo, or null.</p>
</li>
</ul>
<p>Inherited from <code>CommonLinuxOptions</code>:</p>
Expand Down
3 changes: 1 addition & 2 deletions packages/app-builder-lib/scheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -4984,8 +4984,7 @@
"type": "null"
}
],
"default": "lzo",
"description": "Sets the compression type for the snap. Can be xz or lzo. Defaults to lzo when not specified."
"description": "Sets the compression type for the snap. Can be xz, lzo, or null."
},
"confinement": {
"anyOf": [
Expand Down
3 changes: 1 addition & 2 deletions packages/app-builder-lib/src/options/SnapOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ export interface SnapOptions extends CommonLinuxOptions, TargetSpecificOptions {
readonly title?: string | null

/**
* Sets the compression type for the snap. Can be xz or lzo. Defaults to lzo when not specified.
* @default lzo
* Sets the compression type for the snap. Can be xz, lzo, or null.
*/
readonly compression?: "xz" | "lzo" | null
}
Expand Down
1 change: 0 additions & 1 deletion packages/app-builder-lib/templates/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
base: core18
grade: stable
confinement: strict
compression: lzo
parts:
launch-scripts:
plugin: dump
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"7zip-bin": "~5.1.1",
"@types/debug": "^4.1.6",
"@types/fs-extra": "^9.0.11",
"app-builder-bin": "4.1.0",
"app-builder-bin": "4.0.0",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "workspace:*",
"chalk": "^4.1.1",
Expand Down
9 changes: 5 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions test/snapshots/linux/snapTest.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -116,7 +115,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -411,7 +409,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -483,7 +480,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -554,7 +550,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -605,7 +600,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "classic",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -771,7 +765,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "classic",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -938,7 +931,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "classic",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1105,7 +1097,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "classic",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1283,7 +1274,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1345,7 +1335,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1548,7 +1537,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1764,7 +1752,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down Expand Up @@ -1839,7 +1826,6 @@ Object {
"amd64",
],
"base": "core18",
"compression": "lzo",
"confinement": "strict",
"description": "Test Application (test quite “ #378)",
"grade": "stable",
Expand Down
2 changes: 0 additions & 2 deletions test/src/linux/snapTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,6 @@ test.ifDevOrLinuxCi(
},
effectiveOptionComputed: async ({ snap, args }) => {
expect(snap).toMatchSnapshot()
expect(snap.compression).toEqual("lzo")
expect(args).toEqual(expect.arrayContaining(["--compression", "lzo"]))
return true
},
})
Expand Down

0 comments on commit 2e4e179

Please sign in to comment.