Skip to content

Commit aada57f

Browse files
committed
produce dmg/exe/AppImage instead of zips, fix publish null channel
1 parent 6da8ec7 commit aada57f

3 files changed

Lines changed: 18 additions & 43 deletions

File tree

‎.github/workflows/publish-desktop.yml‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -102,44 +102,18 @@ jobs:
102102
working-directory: apps/desktop
103103

104104
- name: Build desktop distributables
105-
run: npx electron-builder --${{ matrix.platform }} --${{ matrix.arch }} --dir
105+
run: npx electron-builder --${{ matrix.platform }} --${{ matrix.arch }}
106106
working-directory: apps/desktop
107107

108-
- name: Package (macOS)
109-
if: matrix.platform == 'mac'
110-
working-directory: apps/desktop/dist
111-
run: |
112-
APP_DIR=$(find . -name "*.app" -maxdepth 2 | head -1)
113-
if [ -n "$APP_DIR" ]; then
114-
ditto -c -k --sequesterRsrc --keepParent "$APP_DIR" "Executor-${{ matrix.arch }}-mac.zip"
115-
fi
116-
117-
- name: Package (Linux)
118-
if: matrix.platform == 'linux'
119-
working-directory: apps/desktop/dist
120-
run: |
121-
UNPACKED=$(find . -name "unpacked" -type d -maxdepth 2 | head -1)
122-
if [ -n "$UNPACKED" ]; then
123-
tar -czf "Executor-x64-linux.tar.gz" -C "$UNPACKED" .
124-
fi
125-
126-
- name: Package (Windows)
127-
if: matrix.platform == 'win'
128-
working-directory: apps/desktop/dist
129-
shell: pwsh
130-
run: |
131-
$unpacked = Get-ChildItem -Path . -Filter "win-unpacked" -Directory -Recurse | Select-Object -First 1
132-
if ($unpacked) {
133-
Compress-Archive -Path "$($unpacked.FullName)\*" -DestinationPath "Executor-x64-win.zip"
134-
}
135-
136108
- name: Upload artifacts
137109
uses: actions/upload-artifact@v4
138110
with:
139111
name: desktop-${{ matrix.platform }}-${{ matrix.arch }}
140112
path: |
141-
apps/desktop/dist/Executor-*.zip
142-
apps/desktop/dist/Executor-*.tar.gz
113+
apps/desktop/dist/*.dmg
114+
apps/desktop/dist/*.exe
115+
apps/desktop/dist/*.AppImage
116+
apps/desktop/dist/*.deb
143117
if-no-files-found: warn
144118

145119
release:
@@ -157,7 +131,7 @@ jobs:
157131
env:
158132
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
159133
run: |
160-
find artifacts -type f \( -name "*.zip" -o -name "*.tar.gz" \) | while read file; do
134+
find artifacts -type f \( -name "*.dmg" -o -name "*.exe" -o -name "*.AppImage" -o -name "*.deb" \) | while read file; do
161135
echo "Uploading: $file"
162136
gh release upload "${{ inputs.tag }}" "$file" --repo "${{ github.repository }}" --clobber || true
163137
done

‎apps/desktop/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"build": {
2626
"appId": "com.executor.desktop",
2727
"productName": "Executor",
28+
"publish": null,
2829
"files": [
2930
"dist/**/*"
3031
],

‎apps/marketing/src/pages/setup.astro‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import Layout from '../layouts/Layout.astro'
3535
<svg class="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M19 14l-7 7m0 0l-7-7m7 7V3"/></svg>
3636
<span id="primary-label">Download for macOS</span>
3737
</a>
38-
<p class="mt-3 text-[12px] text-ink-faint" id="primary-meta">Apple Silicon &amp; Intel &middot; .zip</p>
38+
<p class="mt-3 text-[12px] text-ink-faint" id="primary-meta">Apple Silicon &amp; Intel &middot; .dmg</p>
3939
</div>
4040

4141
<!-- Other platforms link -->
@@ -50,15 +50,15 @@ import Layout from '../layouts/Layout.astro'
5050
<div class="grid sm:grid-cols-3 gap-4">
5151
<a id="link-mac" href="#" class="group rounded-xl border border-rule hover:border-teal/30 p-5 text-center transition-all">
5252
<div class="text-[14px] font-medium text-ink mb-1">macOS</div>
53-
<p class="text-[11px] text-ink-faint">Apple Silicon &amp; Intel &middot; .zip</p>
53+
<p class="text-[11px] text-ink-faint">Apple Silicon &amp; Intel &middot; .dmg</p>
5454
</a>
5555
<a id="link-win" href="#" class="group rounded-xl border border-rule hover:border-teal/30 p-5 text-center transition-all">
5656
<div class="text-[14px] font-medium text-ink mb-1">Windows</div>
57-
<p class="text-[11px] text-ink-faint">Windows 10+ &middot; .zip</p>
57+
<p class="text-[11px] text-ink-faint">Windows 10+ &middot; .exe</p>
5858
</a>
5959
<a id="link-linux" href="#" class="group rounded-xl border border-rule hover:border-teal/30 p-5 text-center transition-all">
6060
<div class="text-[14px] font-medium text-ink mb-1">Linux</div>
61-
<p class="text-[11px] text-ink-faint">Linux x64 &middot; .tar.gz</p>
61+
<p class="text-[11px] text-ink-faint">Linux x64 &middot; .AppImage</p>
6262
</a>
6363
</div>
6464
</div>
@@ -96,9 +96,9 @@ import Layout from '../layouts/Layout.astro'
9696
const RELEASE_API = `https://api.github.com/repos/${REPO}/releases/latest`;
9797

9898
const PLATFORMS = {
99-
mac: { label: 'Download for macOS', meta: 'Apple Silicon & Intel \u00b7 .zip' },
100-
win: { label: 'Download for Windows', meta: 'Windows 10+ \u00b7 .zip' },
101-
linux: { label: 'Download for Linux', meta: 'Linux x64 \u00b7 .tar.gz' },
99+
mac: { label: 'Download for macOS', meta: 'Apple Silicon & Intel \u00b7 .dmg' },
100+
win: { label: 'Download for Windows', meta: 'Windows 10+ \u00b7 .exe' },
101+
linux: { label: 'Download for Linux', meta: 'Linux x64 \u00b7 .AppImage' },
102102
};
103103

104104
function detectOS() {
@@ -124,13 +124,13 @@ import Layout from '../layouts/Layout.astro'
124124

125125
const find = (pattern) => assets.find(a => pattern.test(a.name));
126126

127-
// Match: Executor-arm64-mac.zip or Executor-x64-mac.zip based on Apple Silicon
127+
// Match: .dmg for macOS (arm64 preferred on Apple Silicon), .exe for Windows, .AppImage for Linux
128128
const isAppleSilicon = navigator.userAgent.includes('Mac') &&
129129
(navigator.userAgent.includes('ARM') || navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 0);
130-
const macAsset = find(isAppleSilicon ? /Executor-arm64-mac\.zip$/ : /Executor-x64-mac\.zip$/);
130+
const macAsset = find(isAppleSilicon ? /arm64\.dmg$/ : /x64\.dmg$/) || find(/\.dmg$/);
131131
const macUrl = macAsset?.browser_download_url;
132-
const winUrl = find(/Executor-x64-win\.zip$/)?.browser_download_url;
133-
const linuxUrl = find(/Executor-x64-linux\.tar\.gz$/)?.browser_download_url;
132+
const winUrl = find(/\.exe$/)?.browser_download_url;
133+
const linuxUrl = find(/\.AppImage$/)?.browser_download_url;
134134

135135
const urls = { mac: macUrl, win: winUrl, linux: linuxUrl };
136136

0 commit comments

Comments
 (0)