Skip to content

Commit f5b9507

Browse files
authored
Fix broken arm build (#2017)
The GitHub ARM runners have some bad dependencies. I'm adding a `snap refresh` and `lxd init` to ensure these dependencies are good before we run the build. I'm also updating to the latest `electron-builder` and `electron-updater`.
1 parent aa7713e commit f5b9507

File tree

5 files changed

+165
-207
lines changed

5 files changed

+165
-207
lines changed

.github/workflows/build-helper.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
runner: "macos-latest"
2424
- platform: "linux"
2525
runner: "ubuntu-latest"
26-
# - platform: "linux"
27-
# runner: ubuntu-24.04-arm
26+
- platform: "linux"
27+
runner: ubuntu-24.04-arm
2828
- platform: "windows"
2929
runner: "windows-latest"
3030
# - platform: "windows"
@@ -38,6 +38,9 @@ jobs:
3838
sudo apt-get update
3939
sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm squashfs-tools
4040
sudo snap install snapcraft --classic
41+
sudo snap install lxd
42+
sudo lxd init --auto
43+
sudo snap refresh
4144
- name: Install Zig (not Mac)
4245
if: matrix.platform != 'darwin'
4346
uses: mlugg/setup-zig@v1
@@ -159,6 +162,12 @@ jobs:
159162
with:
160163
name: ${{ matrix.runner }}
161164
path: make
165+
- name: Upload Snapcraft logs on failure
166+
if: failure()
167+
uses: actions/upload-artifact@v4
168+
with:
169+
name: ${{ matrix.runner }}-log
170+
path: /home/runner/.local/state/snapcraft/log
162171
create-release:
163172
runs-on: ubuntu-latest
164173
needs: build-app

BUILD.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ For packaging, the following additional packages are required:
4545
- `lxd` — [Installation instructions](https://canonical.com/lxd/install)
4646
- `snapcraft` — Run `sudo snap install snapcraft --classic`
4747
- `libarchive-tools` — Install via your package manager
48+
- `binutils` — Install via your package manager
4849
- `libopenjp2-tools` — Install via your package manager
4950
- `squashfs-tools` — Install via your package manager
5051

electron-builder.config.cjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ const config = {
7777
synopsis: pkg.description,
7878
description: null,
7979
desktop: {
80-
Name: pkg.productName,
81-
Comment: pkg.description,
82-
Keywords: "developer;terminal;emulator;",
83-
category: "Development;Utility;",
80+
entry: {
81+
Name: pkg.productName,
82+
Comment: pkg.description,
83+
Keywords: "developer;terminal;emulator;",
84+
Categories: "Development;Utility;",
85+
},
8486
},
8587
executableArgs: ["--enable-features", "UseOzonePlatform", "--ozone-platform-hint", "auto"], // Hint Electron to use Ozone abstraction layer for native Wayland support
8688
},

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@vitejs/plugin-react-swc": "^3.8.0",
6464
"@vitest/coverage-istanbul": "^3.0.5",
6565
"electron": "^34.0.2",
66-
"electron-builder": "^25.1.8",
66+
"electron-builder": "^26.0",
6767
"electron-vite": "^2.3.0",
6868
"eslint": "^9.20.1",
6969
"eslint-config-prettier": "^10.0.1",
@@ -115,7 +115,7 @@
115115
"css-tree": "^3.1.0",
116116
"dayjs": "^1.11.13",
117117
"debug": "^4.4.0",
118-
"electron-updater": "6.3.9",
118+
"electron-updater": "^6.6",
119119
"env-paths": "^3.0.0",
120120
"fast-average-color": "^9.4.0",
121121
"htl": "^0.3.1",

0 commit comments

Comments
 (0)