Skip to content

Commit 8c60fd4

Browse files
chore(aur): switch AUR to Electron Linux builds, drop Tauri Linux targets (anomalyco#1668)
- PKGBUILD now packages Electron tar.gz instead of Tauri .deb - Installs under /opt/openwork with desktop entry and icon - Removes Linux (deb/rpm) targets from Tauri release and prerelease matrices - AUR publish now waits on publish-electron instead of publish-tauri - Updates aur-validate workflow for tarball artifacts - Adds options=(!strip) to preserve upstream Electron binaries
1 parent e1d97a3 commit 8c60fd4

8 files changed

Lines changed: 106 additions & 153 deletions

File tree

‎.github/workflows/aur-validate.yml‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
- publish-ready
2929
default: smoke
3030
artifact_source:
31-
description: "Where to source desktop .deb"
31+
description: "Where to source Electron desktop tarball"
3232
required: false
3333
type: choice
3434
options:
@@ -47,9 +47,9 @@ on:
4747
description: "Artifact name in artifact_run_id"
4848
required: false
4949
type: string
50-
default: openwork-desktop-linux-amd64-deb
50+
default: openwork-electron-linux-x64
5151
asset_url_x86_64:
52-
description: "Optional explicit public URL for x86_64 .deb"
52+
description: "Optional explicit public URL for x86_64 Electron tarball"
5353
required: false
5454
type: string
5555
push_to_aur:
@@ -93,7 +93,7 @@ on:
9393
artifact_name:
9494
required: false
9595
type: string
96-
default: openwork-desktop-linux-amd64-deb
96+
default: openwork-electron-linux-x64
9797
asset_url_x86_64:
9898
required: false
9999
type: string
@@ -131,7 +131,7 @@ jobs:
131131
INPUT_RELEASE_TAG: ${{ inputs.release_tag }}
132132
INPUT_ASSET_URL_X86_64: ${{ inputs.asset_url_x86_64 }}
133133
INPUT_ARTIFACT_RUN_ID: ${{ inputs.artifact_run_id }}
134-
INPUT_ARTIFACT_NAME: ${{ inputs.artifact_name || 'openwork-desktop-linux-amd64-deb' }}
134+
INPUT_ARTIFACT_NAME: ${{ inputs.artifact_name || 'openwork-electron-linux-x64' }}
135135
PUSH_TO_AUR: ${{ inputs.push_to_aur && 'true' || 'false' }}
136136
AUR_REPO: ${{ inputs.aur_repo || 'openwork' }}
137137
steps:
@@ -195,7 +195,7 @@ jobs:
195195
chmod 0440 /etc/sudoers.d/builder
196196
chown -R builder:builder "$GITHUB_WORKSPACE"
197197
198-
- name: Download release asset (.deb)
198+
- name: Download release asset (Electron tarball)
199199
if: env.ARTIFACT_SOURCE == 'release'
200200
shell: bash
201201
env:
@@ -220,11 +220,12 @@ jobs:
220220
221221
asset_url="${INPUT_ASSET_URL_X86_64:-}"
222222
if [ -z "$asset_url" ]; then
223-
asset_url="https://github.com/${GITHUB_REPOSITORY}/releases/download/${release_tag}/openwork-desktop-linux-amd64.deb"
223+
version="${release_tag#v}"
224+
asset_url="https://github.com/${GITHUB_REPOSITORY}/releases/download/${release_tag}/openwork-linux-x64-${version}.tar.gz"
224225
fi
225226
226227
mkdir -p /tmp/aur-artifacts
227-
curl -fL --retry 5 --retry-all-errors --retry-delay 2 "$asset_url" -o /tmp/aur-artifacts/openwork-desktop-linux-amd64.deb
228+
curl -fL --retry 5 --retry-all-errors --retry-delay 2 "$asset_url" -o /tmp/aur-artifacts/openwork-linux-x64.tar.gz
228229
229230
echo "RESOLVED_RELEASE_TAG=${release_tag}" >> "$GITHUB_ENV"
230231
echo "RESOLVED_ASSET_URL_X86_64=${asset_url}" >> "$GITHUB_ENV"
@@ -233,7 +234,7 @@ jobs:
233234
if: env.ARTIFACT_SOURCE == 'local-build-artifact' && env.INPUT_ASSET_URL_X86_64 == ''
234235
uses: actions/download-artifact@v8
235236
with:
236-
name: ${{ inputs.artifact_name || 'openwork-desktop-linux-amd64-deb' }}
237+
name: ${{ inputs.artifact_name || 'openwork-electron-linux-x64' }}
237238
run-id: ${{ inputs.artifact_run_id }}
238239
github-token: ${{ github.token }}
239240
path: /tmp/aur-artifacts
@@ -244,21 +245,24 @@ jobs:
244245
run: |
245246
set -euo pipefail
246247
mkdir -p /tmp/aur-artifacts
247-
curl -fL --retry 5 --retry-all-errors --retry-delay 2 "${INPUT_ASSET_URL_X86_64}" -o /tmp/aur-artifacts/openwork-desktop-linux-amd64.deb
248+
curl -fL --retry 5 --retry-all-errors --retry-delay 2 "${INPUT_ASSET_URL_X86_64}" -o /tmp/aur-artifacts/openwork-linux-x64.tar.gz
248249
249250
- name: Resolve local artifact path
250251
if: env.ARTIFACT_SOURCE == 'local-build-artifact'
251252
shell: bash
252253
run: |
253254
set -euo pipefail
254-
deb_path=$(find /tmp/aur-artifacts -maxdepth 3 -type f -name '*.deb' | head -n 1)
255-
if [ -z "${deb_path:-}" ]; then
256-
echo "No .deb file found in /tmp/aur-artifacts" >&2
255+
asset_path=$(find /tmp/aur-artifacts -maxdepth 3 -type f -name 'openwork-linux-x64-*.tar.gz' | head -n 1)
256+
if [ -z "${asset_path:-}" ]; then
257+
asset_path=$(find /tmp/aur-artifacts -maxdepth 3 -type f -name '*.tar.gz' | head -n 1)
258+
fi
259+
if [ -z "${asset_path:-}" ]; then
260+
echo "No Electron tarball found in /tmp/aur-artifacts" >&2
257261
exit 1
258262
fi
259263
260-
if [ "$deb_path" != "/tmp/aur-artifacts/openwork-desktop-linux-amd64.deb" ]; then
261-
cp "$deb_path" /tmp/aur-artifacts/openwork-desktop-linux-amd64.deb
264+
if [ "$asset_path" != "/tmp/aur-artifacts/openwork-linux-x64.tar.gz" ]; then
265+
cp "$asset_path" /tmp/aur-artifacts/openwork-linux-x64.tar.gz
262266
fi
263267
264268
- name: Resolve version, URL, and checksum
@@ -267,9 +271,9 @@ jobs:
267271
run: |
268272
set -euo pipefail
269273
270-
deb_path="/tmp/aur-artifacts/openwork-desktop-linux-amd64.deb"
271-
if [ ! -f "$deb_path" ]; then
272-
echo "Expected $deb_path to exist" >&2
274+
asset_path="/tmp/aur-artifacts/openwork-linux-x64.tar.gz"
275+
if [ ! -f "$asset_path" ]; then
276+
echo "Expected $asset_path to exist" >&2
273277
exit 1
274278
fi
275279
@@ -286,14 +290,14 @@ jobs:
286290
exit 1
287291
fi
288292
289-
sha256="$(sha256sum "$deb_path" | awk '{print $1}')"
293+
sha256="$(sha256sum "$asset_path" | awk '{print $1}')"
290294
291295
source_url="${RESOLVED_ASSET_URL_X86_64:-}"
292296
if [ -z "$source_url" ] && [ -n "${INPUT_ASSET_URL_X86_64:-}" ]; then
293297
source_url="${INPUT_ASSET_URL_X86_64}"
294298
fi
295299
if [ -z "$source_url" ]; then
296-
source_url="https://github.com/${GITHUB_REPOSITORY}/releases/download/v${version}/openwork-desktop-linux-amd64.deb"
300+
source_url="https://github.com/${GITHUB_REPOSITORY}/releases/download/v${version}/openwork-linux-x64-${version}.tar.gz"
297301
fi
298302
299303
echo "version=${version}" >> "$GITHUB_OUTPUT"
@@ -325,7 +329,7 @@ jobs:
325329
text = re.sub(r"^arch=.*$", "arch=('x86_64')", text, flags=re.M)
326330
text = re.sub(
327331
r"^source_x86_64=.*$",
328-
"source_x86_64=(\"${pkgname}-${pkgver}.deb::" + source_url + "\")",
332+
"source_x86_64=(\"${pkgname}-${pkgver}-x64.tar.gz::" + source_url + "\")",
329333
text,
330334
flags=re.M,
331335
)

‎.github/workflows/prerelease.yml‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ jobs:
7575
publish-tauri:
7676
name: Build + Publish (${{ matrix.target }})
7777
needs: prepare-release
78-
# Set OPENWORK_LINUX_X64_RUNNER_LABEL to route only the Linux x86_64 build to a larger runner.
79-
runs-on: ${{ matrix.target == 'x86_64-unknown-linux-gnu' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL != '' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL || matrix.platform }}
78+
runs-on: ${{ matrix.platform }}
8079
timeout-minutes: 360
8180

8281
env:
@@ -98,29 +97,12 @@ jobs:
9897
os_type: macos
9998
target: x86_64-apple-darwin
10099
args: "--target x86_64-apple-darwin --bundles dmg,app"
101-
- platform: ubuntu-22.04
102-
os_type: linux
103-
target: x86_64-unknown-linux-gnu
104-
args: "--target x86_64-unknown-linux-gnu --bundles deb,rpm"
105-
- platform: ubuntu-22.04-arm
106-
os_type: linux
107-
target: aarch64-unknown-linux-gnu
108-
args: "--target aarch64-unknown-linux-gnu --bundles deb,rpm"
109100
- platform: windows-2022
110101
os_type: windows
111102
target: x86_64-pc-windows-msvc
112103
args: "--target x86_64-pc-windows-msvc --bundles msi"
113104

114105
steps:
115-
- name: Log runner selection
116-
shell: bash
117-
run: |
118-
echo "Requested larger runner label: ${RUNNER_LABEL:-<unset>}"
119-
echo "Effective runs-on: ${EFFECTIVE_RUNS_ON}"
120-
env:
121-
RUNNER_LABEL: ${{ vars.OPENWORK_LINUX_X64_RUNNER_LABEL }}
122-
EFFECTIVE_RUNS_ON: ${{ matrix.target == 'x86_64-unknown-linux-gnu' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL != '' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL || matrix.platform }}
123-
124106
- name: Checkout
125107
uses: actions/checkout@v6
126108
with:
@@ -153,21 +135,6 @@ jobs:
153135
if: matrix.os_type == 'macos' && matrix.target == 'x86_64-apple-darwin'
154136
run: pnpm add -w --ignore-workspace-root-check @opentui/[email protected]
155137

156-
- name: Install Linux build dependencies
157-
if: matrix.os_type == 'linux'
158-
run: |
159-
sudo apt-get update
160-
sudo apt-get install -y \
161-
libgtk-3-dev \
162-
libglib2.0-dev \
163-
libayatana-appindicator3-dev \
164-
libsoup-3.0-dev \
165-
libwebkit2gtk-4.1-dev \
166-
libssl-dev \
167-
rpm \
168-
libdbus-1-dev \
169-
librsvg2-dev
170-
171138
- name: Setup Rust
172139
uses: dtolnay/rust-toolchain@stable
173140
with:

‎.github/workflows/release-macos-aarch64.yml‎

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,7 @@ jobs:
252252
name: Build + Publish (${{ matrix.target }})
253253
needs: [resolve-release, verify-release]
254254
if: needs.resolve-release.outputs.build_tauri == 'true'
255-
# Set OPENWORK_LINUX_X64_RUNNER_LABEL to route only the Linux x86_64 build to a larger runner.
256-
runs-on: ${{ matrix.target == 'x86_64-unknown-linux-gnu' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL != '' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL || matrix.platform }}
255+
runs-on: ${{ matrix.platform }}
257256
timeout-minutes: 360
258257
env:
259258
RELEASE_TAG: ${{ needs.resolve-release.outputs.release_tag }}
@@ -277,29 +276,12 @@ jobs:
277276
os_type: macos
278277
target: x86_64-apple-darwin
279278
args: "--target x86_64-apple-darwin --bundles dmg,app"
280-
- platform: ubuntu-22.04
281-
os_type: linux
282-
target: x86_64-unknown-linux-gnu
283-
args: "--target x86_64-unknown-linux-gnu --bundles deb,rpm"
284-
- platform: ubuntu-22.04-arm
285-
os_type: linux
286-
target: aarch64-unknown-linux-gnu
287-
args: "--target aarch64-unknown-linux-gnu --bundles deb,rpm"
288279
- platform: windows-2022
289280
os_type: windows
290281
target: x86_64-pc-windows-msvc
291282
args: "--target x86_64-pc-windows-msvc --bundles msi"
292283

293284
steps:
294-
- name: Log runner selection
295-
shell: bash
296-
run: |
297-
echo "Requested larger runner label: ${RUNNER_LABEL:-<unset>}"
298-
echo "Effective runs-on: ${EFFECTIVE_RUNS_ON}"
299-
env:
300-
RUNNER_LABEL: ${{ vars.OPENWORK_LINUX_X64_RUNNER_LABEL }}
301-
EFFECTIVE_RUNS_ON: ${{ matrix.target == 'x86_64-unknown-linux-gnu' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL != '' && vars.OPENWORK_LINUX_X64_RUNNER_LABEL || matrix.platform }}
302-
303285
- name: Checkout
304286
uses: actions/checkout@v6
305287
with:
@@ -359,21 +341,6 @@ jobs:
359341
if: matrix.os_type == 'macos' && matrix.target == 'x86_64-apple-darwin'
360342
run: pnpm add -w --ignore-workspace-root-check @opentui/[email protected]
361343

362-
- name: Install Linux build dependencies
363-
if: matrix.os_type == 'linux'
364-
run: |
365-
sudo apt-get update
366-
sudo apt-get install -y \
367-
libgtk-3-dev \
368-
libglib2.0-dev \
369-
libayatana-appindicator3-dev \
370-
libsoup-3.0-dev \
371-
libwebkit2gtk-4.1-dev \
372-
libssl-dev \
373-
rpm \
374-
libdbus-1-dev \
375-
librsvg2-dev
376-
377344
- name: Setup Rust
378345
uses: dtolnay/rust-toolchain@stable
379346
with:
@@ -1076,11 +1043,11 @@ jobs:
10761043

10771044
aur-publish:
10781045
name: Publish AUR
1079-
needs: [resolve-release, publish-tauri, publish-release]
1046+
needs: [resolve-release, publish-electron, publish-release]
10801047
if: |
10811048
always() &&
10821049
needs.resolve-release.result == 'success' &&
1083-
(needs.publish-tauri.result == 'success' || needs.publish-tauri.result == 'skipped') &&
1050+
needs.publish-electron.result == 'success' &&
10841051
(needs.publish-release.result == 'success' || needs.publish-release.result == 'skipped')
10851052
runs-on: blacksmith-4vcpu-ubuntu-2404
10861053
permissions:

‎RELEASE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Use `pnpm release:review --json` when automating these checks in scripts or agen
4646

4747
## AUR
4848

49-
`Release App` publishes the Arch AUR package automatically after the Linux `.deb` asset is uploaded.
49+
`Release App` publishes the Arch AUR package automatically after the Electron Linux tarball assets are uploaded.
5050

5151
For local AMD64 Arch builds without Docker, see `packaging/aur/README.md`.
5252

‎packaging/aur/.SRCINFO‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@ pkgbase = openwork
77
arch = aarch64
88
license = MIT
99
depends = gtk3
10-
depends = glib2
11-
depends = libayatana-appindicator
12-
depends = libsoup3
13-
depends = webkit2gtk-4.1
14-
depends = openssl
10+
depends = nss
11+
depends = alsa-lib
12+
depends = libxss
13+
depends = libxtst
14+
depends = xdg-utils
15+
depends = at-spi2-core
16+
depends = libdrm
17+
depends = libxkbcommon
18+
depends = mesa
1519
depends = dbus
16-
depends = librsvg
17-
noextract = openwork-0.13.3.deb
18-
source_x86_64 = openwork-0.13.3.deb::https://github.com/different-ai/openwork/releases/download/v0.13.3/openwork-desktop-linux-amd64.deb
19-
sha256sums_x86_64 = b6fb8ecb86eb9e62d4379f3beb9390106378d3d95dd24b2d405a3377a4acc4a1
20-
source_aarch64 = openwork-0.13.3.deb::https://github.com/different-ai/openwork/releases/download/v0.13.3/openwork-desktop-linux-arm64.deb
21-
sha256sums_aarch64 = 9f5602b30536a014a39850e9eb656bcb10242c84988b08c8e961a59f9453c93c
20+
depends = hicolor-icon-theme
21+
options = !strip
22+
source_x86_64 = openwork-0.13.3-x64.tar.gz::https://github.com/different-ai/openwork/releases/download/v0.13.3/openwork-linux-x64-0.13.3.tar.gz
23+
sha256sums_x86_64 = 35b4a2da4b09ada2ea5bb0495f0be0129989625f26c4efc018d0faf149b51adc
24+
source_aarch64 = openwork-0.13.3-arm64.tar.gz::https://github.com/different-ai/openwork/releases/download/v0.13.3/openwork-linux-arm64-0.13.3.tar.gz
25+
sha256sums_aarch64 = f3cc306bc7cf30537dacdc468d59e516d39f96466cec83d181101cd6c1f3d02d
2226

2327
pkgname = openwork

0 commit comments

Comments
 (0)