Skip to content

Commit e4e2429

Browse files
committed
chore: change arm worker
1 parent 14f03f8 commit e4e2429

4 files changed

Lines changed: 132 additions & 33 deletions

File tree

.github/workflows/build-tauri.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ on:
1414
required: false
1515
default: ""
1616
workflow_dispatch:
17+
inputs:
18+
environment:
19+
description: "Environment to deploy to (use 'Release' for signed release builds)"
20+
type: choice
21+
required: false
22+
default: ""
23+
options:
24+
- ""
25+
- Release
1726
jobs:
1827
build:
1928
name: "Test Build"
@@ -26,18 +35,16 @@ jobs:
2635
include:
2736
- os: ubuntu-latest
2837
name: linux
29-
# https://tauri.app/v1/guides/building/linux#cross-compiling-tauri-applications-for-arm-based-devices
30-
# Cross Compiling is also more of a pain it seems for linux atm, explore later
3138
targets: "x86_64-unknown-linux-gnu"
32-
tauri_target: ["x86_64-unknown-linux-gnu"]
39+
tauri_target: ["'x86_64-unknown-linux-gnu --bundles deb,appimage,updater'"]
40+
- os: ubuntu-24.04-arm
41+
name: linux-arm
42+
targets: "aarch64-unknown-linux-gnu"
43+
tauri_target: ["'aarch64-unknown-linux-gnu --bundles deb,appimage,updater'"]
3344
- os: macos-latest
3445
name: mac
3546
targets: "aarch64-apple-darwin,x86_64-apple-darwin"
36-
tauri_target: ["universal-apple-darwin"]
37-
- os: ubuntu-latest
38-
name: linux-arm
39-
targets: "aarch64-unknown-linux-gnu"
40-
tauri_target: ["aarch64-unknown-linux-gnu"]
47+
tauri_target: ["'universal-apple-darwin --bundles app,dmg,updater'"]
4148
- os: windows-latest
4249
name: win
4350
targets: "aarch64-pc-windows-msvc,x86_64-pc-windows-msvc"
@@ -67,7 +74,7 @@ jobs:
6774
with:
6875
workspaces: "./app/tauri -> target"
6976
- name: install dependencies (ubuntu only)
70-
if: matrix.os == 'ubuntu-latest'
77+
if: startsWith(matrix.os, 'ubuntu')
7178
run: |
7279
sudo apt-get update
7380
sudo apt-get install -y libwebkit2gtk-4.1 build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev javascriptcoregtk-4.1 libglib2.0-dev
@@ -136,16 +143,16 @@ jobs:
136143
with:
137144
name: tauri-mac
138145
path: artifacts/tauri-mac
139-
- name: Download Linux Arm
140-
uses: actions/download-artifact@v3
141-
with:
142-
name: tauri-linux-arm
143-
path: artifacts/tauri-linux-arm
144146
- name: Download Linux
145147
uses: actions/download-artifact@v4
146148
with:
147149
name: tauri-linux
148150
path: artifacts/tauri-linux
151+
- name: Download Linux ARM
152+
uses: actions/download-artifact@v4
153+
with:
154+
name: tauri-linux-arm
155+
path: artifacts/tauri-linux-arm
149156
- name: Use Node.js 24.x
150157
uses: actions/setup-node@v6
151158
with:

app/tauri/release-prep/release-prep.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ function addPlatformUpdater(
8181
nameOverwrite
8282
) {
8383
const fullPath = path.join(artifactsPath, artifactSubPath);
84+
if (!fs.existsSync(fullPath)) {
85+
console.warn(
86+
`[SKIP] ${platform}: artifact path not found (expected for non-release builds): ${fullPath}`
87+
);
88+
return;
89+
}
8490
const files = fs.readdirSync(fullPath);
8591
const file = files.find((file) => file.match(fileGlob));
8692

@@ -155,12 +161,16 @@ addPlatformUpdater(
155161
/\.tar\.gz$/,
156162
"darwin-universal"
157163
);
158-
// Need to look into linus for arm, I don't believe it's supported for tauri at least.
159164
addPlatformUpdater(
160165
"linux-x86_64",
161166
"tauri-linux/x86_64-unknown-linux-gnu/release/bundle/appimage",
162167
/\.AppImage.tar.gz$/
163168
);
169+
addPlatformUpdater(
170+
"linux-aarch64",
171+
"tauri-linux-arm/aarch64-unknown-linux-gnu/release/bundle/appimage",
172+
/\.AppImage.tar.gz$/
173+
);
164174
addPlatformUpdater(
165175
"windows-x86_64",
166176
"tauri-win/x86_64-pc-windows-msvc/release/bundle/msi",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"resolutions": {
6767
"@types/react": "^16.9.46",
6868
"@types/react-dom": "^16.9.19",
69-
"react-error-overlay": "6.0.9"
69+
"react-error-overlay": "6.0.9",
70+
"@parcel/watcher": "2.5.6"
7071
}
7172
}

yarn.lock

Lines changed: 98 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2795,13 +2795,94 @@
27952795
dependencies:
27962796
"@octokit/openapi-types" "^18.0.0"
27972797

2798-
"@parcel/watcher@2.0.4":
2799-
version "2.0.4"
2800-
resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
2801-
integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
2802-
dependencies:
2803-
node-addon-api "^3.2.1"
2804-
node-gyp-build "^4.3.0"
2798+
"@parcel/watcher-android-arm64@2.5.6":
2799+
version "2.5.6"
2800+
resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz#5f32e0dba356f4ac9a11068d2a5c134ca3ba6564"
2801+
integrity sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==
2802+
2803+
"@parcel/watcher-darwin-arm64@2.5.6":
2804+
version "2.5.6"
2805+
resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz#88d3e720b59b1eceffce98dac46d7c40e8be5e8e"
2806+
integrity sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==
2807+
2808+
"@parcel/watcher-darwin-x64@2.5.6":
2809+
version "2.5.6"
2810+
resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz#bf05d76a78bc15974f15ec3671848698b0838063"
2811+
integrity sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==
2812+
2813+
"@parcel/watcher-freebsd-x64@2.5.6":
2814+
version "2.5.6"
2815+
resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz#8bc26e9848e7303ac82922a5ae1b1ef1bdb48a53"
2816+
integrity sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==
2817+
2818+
"@parcel/watcher-linux-arm-glibc@2.5.6":
2819+
version "2.5.6"
2820+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz#1328fee1deb0c2d7865079ef53a2ba4cc2f8b40a"
2821+
integrity sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==
2822+
2823+
"@parcel/watcher-linux-arm-musl@2.5.6":
2824+
version "2.5.6"
2825+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz#bad0f45cb3e2157746db8b9d22db6a125711f152"
2826+
integrity sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==
2827+
2828+
"@parcel/watcher-linux-arm64-glibc@2.5.6":
2829+
version "2.5.6"
2830+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz#b75913fbd501d9523c5f35d420957bf7d0204809"
2831+
integrity sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==
2832+
2833+
"@parcel/watcher-linux-arm64-musl@2.5.6":
2834+
version "2.5.6"
2835+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz#da5621a6a576070c8c0de60dea8b46dc9c3827d4"
2836+
integrity sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==
2837+
2838+
"@parcel/watcher-linux-x64-glibc@2.5.6":
2839+
version "2.5.6"
2840+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz#ce437accdc4b30f93a090b4a221fd95cd9b89639"
2841+
integrity sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==
2842+
2843+
"@parcel/watcher-linux-x64-musl@2.5.6":
2844+
version "2.5.6"
2845+
resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz#02400c54b4a67efcc7e2327b249711920ac969e2"
2846+
integrity sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==
2847+
2848+
"@parcel/watcher-win32-arm64@2.5.6":
2849+
version "2.5.6"
2850+
resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz#caae3d3c7583ca0a7171e6bd142c34d20ea1691e"
2851+
integrity sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==
2852+
2853+
"@parcel/watcher-win32-ia32@2.5.6":
2854+
version "2.5.6"
2855+
resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz#9ac922550896dfe47bfc5ae3be4f1bcaf8155d6d"
2856+
integrity sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==
2857+
2858+
"@parcel/watcher-win32-x64@2.5.6":
2859+
version "2.5.6"
2860+
resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz#73fdafba2e21c448f0e456bbe13178d8fe11739d"
2861+
integrity sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==
2862+
2863+
"@parcel/watcher@2.0.4", "@parcel/watcher@2.5.6":
2864+
version "2.5.6"
2865+
resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.6.tgz#3f932828c894f06d0ad9cfefade1756ecc6ef1f1"
2866+
integrity sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==
2867+
dependencies:
2868+
detect-libc "^2.0.3"
2869+
is-glob "^4.0.3"
2870+
node-addon-api "^7.0.0"
2871+
picomatch "^4.0.3"
2872+
optionalDependencies:
2873+
"@parcel/watcher-android-arm64" "2.5.6"
2874+
"@parcel/watcher-darwin-arm64" "2.5.6"
2875+
"@parcel/watcher-darwin-x64" "2.5.6"
2876+
"@parcel/watcher-freebsd-x64" "2.5.6"
2877+
"@parcel/watcher-linux-arm-glibc" "2.5.6"
2878+
"@parcel/watcher-linux-arm-musl" "2.5.6"
2879+
"@parcel/watcher-linux-arm64-glibc" "2.5.6"
2880+
"@parcel/watcher-linux-arm64-musl" "2.5.6"
2881+
"@parcel/watcher-linux-x64-glibc" "2.5.6"
2882+
"@parcel/watcher-linux-x64-musl" "2.5.6"
2883+
"@parcel/watcher-win32-arm64" "2.5.6"
2884+
"@parcel/watcher-win32-ia32" "2.5.6"
2885+
"@parcel/watcher-win32-x64" "2.5.6"
28052886

28062887
"@pkgjs/parseargs@^0.11.0":
28072888
version "0.11.0"
@@ -6787,7 +6868,7 @@ detect-indent@^5.0.0:
67876868
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
67886869
integrity sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==
67896870

6790-
detect-libc@^2.0.1:
6871+
detect-libc@^2.0.1, detect-libc@^2.0.3:
67916872
version "2.1.2"
67926873
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
67936874
integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
@@ -12352,10 +12433,10 @@ node-addon-api@^1.3.0, node-addon-api@^1.6.3:
1235212433
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
1235312434
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
1235412435

12355-
node-addon-api@^3.2.1:
12356-
version "3.2.1"
12357-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
12358-
integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
12436+
node-addon-api@^7.0.0:
12437+
version "7.1.1"
12438+
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
12439+
integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
1235912440

1236012441
node-api-version@^0.2.0:
1236112442
version "0.2.1"
@@ -12390,11 +12471,6 @@ node-forge@^1:
1239012471
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.3.tgz#0ad80f6333b3a0045e827ac20b7f735f93716751"
1239112472
integrity sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==
1239212473

12393-
node-gyp-build@^4.3.0:
12394-
version "4.8.4"
12395-
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
12396-
integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
12397-
1239812474
node-gyp@^9.0.0:
1239912475
version "9.4.1"
1240012476
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
@@ -13283,6 +13359,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc
1328313359
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
1328413360
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
1328513361

13362+
picomatch@^4.0.3:
13363+
version "4.0.4"
13364+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
13365+
integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
13366+
1328613367
pify@5.0.0:
1328713368
version "5.0.0"
1328813369
resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"

0 commit comments

Comments
 (0)