sdaduanbilei/cc-haha
1
0
Fork 0
mirror of https://github.com/NanmiCoder/cc-haha synced 2026-07-15 12:53:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(release): retry macOS notarization builds

Browse Source 
Tested: bun test scripts/pr/release-workflow.test.ts
Tested: git diff --check
Tested: bun run scripts/release.ts 0.4.3 --dry
Confidence: high
Scope-risk: narrow
This commit is contained in:
程序员阿江(Relakkes) 2026-06-17 02:56:32 +08:00
parent ee480e0cee
commit 5c01675cfa
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/release-desktop.yml vendored
View File

@ -161,7 +161,7 @@ jobs:
- name: Build signed macOS Electron release artifacts
if: matrix.smoke_platform == 'macos' && needs.signing-preflight.outputs.macos_signed == 'true'
working-directory: desktop
timeout-minutes: 45
timeout-minutes: 90
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEBUG: 'electron-builder,electron-osx-sign,electron-notarize*'
@ -183,9 +183,23 @@ jobs:
xcrun notarytool --version || true
security find-identity -v -p codesigning || true
echo "::endgroup::"
echo "Starting signed electron-builder at $(date -u '+%Y-%m-%dT%H:%M:%SZ')"
node ./node_modules/electron-builder/out/cli/cli.js ${{ matrix.builder_args }} --publish never
echo "Finished signed electron-builder at $(date -u '+%Y-%m-%dT%H:%M:%SZ')"
max_attempts=2
for attempt in $(seq 1 "$max_attempts"); do
echo "Starting signed electron-builder attempt ${attempt}/${max_attempts} at $(date -u '+%Y-%m-%dT%H:%M:%SZ')"
rm -rf build-artifacts/electron
if node ./node_modules/electron-builder/out/cli/cli.js ${{ matrix.builder_args }} --publish never; then
echo "Finished signed electron-builder attempt ${attempt}/${max_attempts} at $(date -u '+%Y-%m-%dT%H:%M:%SZ')"
exit 0
fi
status=$?
if [ "$attempt" -eq "$max_attempts" ]; then
echo "::error::Signed electron-builder failed after ${max_attempts} attempts"
exit "$status"
fi
echo "::warning::Signed electron-builder attempt ${attempt}/${max_attempts} failed with exit code ${status}; retrying after 120 seconds"
sleep 120
done
- name: Build unsigned Electron release artifacts
if: matrix.smoke_platform != 'macos' || needs.signing-preflight.outputs.macos_signed != 'true'

9
scripts/pr/release-workflow.test.ts
View File

@ -129,13 +129,16 @@ describe('release desktop workflow', () => {
expect(signedBuildStep).toContain('APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}')
expect(signedBuildStep).toContain('APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}')
expect(signedBuildStep).not.toContain('CSC_IDENTITY_AUTO_DISCOVERY')
expect(signedBuildStep).toContain('timeout-minutes: 45')
expect(signedBuildStep).toContain('timeout-minutes: 90')
expect(signedBuildStep).toContain("DEBUG: 'electron-builder,electron-osx-sign,electron-notarize*'")
expect(signedBuildStep).toContain('macOS signing diagnostics')
expect(signedBuildStep).toContain('xcrun --find notarytool')
expect(signedBuildStep).toContain('security find-identity -v -p codesigning')
expect(signedBuildStep).toContain('Starting signed electron-builder')
expect(signedBuildStep).toContain('Finished signed electron-builder')
expect(signedBuildStep).toContain('max_attempts=2')
expect(signedBuildStep).toContain('rm -rf build-artifacts/electron')
expect(signedBuildStep).toContain('Starting signed electron-builder attempt')
expect(signedBuildStep).toContain('Finished signed electron-builder attempt')
expect(signedBuildStep).toContain('retrying after 120 seconds')
expect(signedBuildStep).toContain(electronBuilderCli)
expect(unsignedBuildStep).toContain("if: matrix.smoke_platform != 'macos' || needs.signing-preflight.outputs.macos_signed != 'true'")