diff --git a/.github/scripts/release-workflow-contract_test.py b/.github/scripts/release-workflow-contract_test.py index d6af15257b..22aedc6bfc 100644 --- a/.github/scripts/release-workflow-contract_test.py +++ b/.github/scripts/release-workflow-contract_test.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 """Contract tests for the maintainer release workflow.""" +import fnmatch import re import unittest from pathlib import Path @@ -146,6 +147,32 @@ class ReleaseWorkflowContractTest(unittest.TestCase): self.assertIn('"${UPDATER_SIGNING_ENABLED:-false}" = "true"', collect) self.assertIn('"$DESKTOP_ASSET_VERIFIER" --require-updaters', collect) + def test_release_asset_globs_are_disjoint_and_upload_sequentially(self) -> None: + publish = step_block("Publish release") + files = re.search(r"\n files: \|\n((?: \S+\n)+)", publish) + self.assertIsNotNone(files) + patterns = [line.strip() for line in files.group(1).splitlines()] + assets = ( + "kandev-linux-x64.tar.gz", + "kandev-linux-x64.tar.gz.sha256", + "kandev-macos-arm64.tar.gz", + "kandev-macos-arm64.tar.gz.sha256", + "kandev-windows-x64.tar.gz", + "kandev-windows-x64.tar.gz.sha256", + "kandev-desktop-macos-arm64-Kandev.app.tar.gz", + "kandev-desktop-macos-arm64-Kandev.app.tar.gz.sha256", + "kandev-desktop-macos-arm64-Kandev.app.tar.gz.sig", + "kandev-desktop-macos-arm64-Kandev.app.tar.gz.sig.sha256", + "latest.json", + ) + + for asset in assets: + path = f"dist/release-assets/{asset}" + matches = [pattern for pattern in patterns if fnmatch.fnmatchcase(path, pattern)] + self.assertEqual(len(matches), 1, f"release glob count for {asset}: {matches}") + + self.assertIn("preserve_order: true", publish) + def test_macos_dmg_build_has_retry_timeout_and_diagnostics(self) -> None: build = step_block("Build Tauri desktop app") self.assertIn("timeout-minutes: 70", build) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7223ca5731..facc3e9141 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1578,10 +1578,15 @@ jobs: name: ${{ needs.prepare.outputs.tag }} body_path: RELEASE_NOTES.md files: | - dist/release-assets/kandev-*.tar.gz - dist/release-assets/kandev-*.tar.gz.sha256 + dist/release-assets/kandev-linux-*.tar.gz + dist/release-assets/kandev-linux-*.tar.gz.sha256 + dist/release-assets/kandev-macos-*.tar.gz + dist/release-assets/kandev-macos-*.tar.gz.sha256 + dist/release-assets/kandev-windows-*.tar.gz + dist/release-assets/kandev-windows-*.tar.gz.sha256 dist/release-assets/kandev-desktop-* dist/release-assets/latest.json + preserve_order: true publish-npm: name: Publish npm packages