Skip to content

Commit a4f09cf

Browse files
committed
chore: small incomplete fixes
1 parent c820f84 commit a4f09cf

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

.github/workflows/build-setapp.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ jobs:
5555
echo "${{ secrets.SETAPP_PUBLIC_KEY }}" > assets/setappPublicKey.pem
5656
echo "✓ Created setappPublicKey.pem from secret"
5757
58+
- name: Clean old build artifacts
59+
run: |
60+
echo "Cleaning old Setapp build artifacts..."
61+
rm -rf release/build-setapp
62+
echo "✓ Cleaned release/build-setapp directory"
63+
5864
- name: Build Setapp variant
5965
run: npm run package:setapp
6066
env:

.github/workflows/release_desktop_app.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ jobs:
100100
- name: Install desktop app dependencies
101101
run: bash ./install.sh
102102

103-
- name: Build/release Electron app
103+
- name: Build Electron app
104+
run: npm run build
105+
106+
- name: Package Electron app
104107
uses: samuelmeuli/action-electron-builder@v1.6.0
105108
with:
106109
github_token: ${{ secrets.publish_token }}
@@ -110,15 +113,17 @@ jobs:
110113
windows_certs: ${{ secrets.windows_certs }}
111114
windows_certs_password: ${{ secrets.windows_certs_password }}
112115
release: false # Don't publish automatically - orchestrator handles releases
116+
skip_build: true # We already built in previous step - just package
113117
env:
114118
APPLE_ID: ${{ secrets.APPLE_ID }}
115119
APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
116120

117121
- name: List build outputs
118122
if: always()
123+
shell: bash
119124
run: |
120125
echo "Build outputs:"
121-
ls -lh release/build/ || echo "No build directory found"
126+
ls -lh release/build/ 2>/dev/null || echo "No build directory found"
122127
123128
- name: Upload macOS artifacts
124129
if: always() && (inputs.platform || github.event.inputs.build_type) == 'macos-latest'

electron-builder-setapp.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"!**/.git/*",
7979
"!**/.gitignore",
8080
"!**/.gitmodules",
81+
"!**/static/nss/win32/**",
8182
"!**/node_modules/@setapp/framework-wrapper/build/{Debug,Release}",
8283
"!**/node_modules/@setapp/framework-wrapper/{src,test}"
8384
]

0 commit comments

Comments
 (0)