diff --git a/.gitea/workflows/app_builder.yaml b/.gitea/workflows/app_builder.yaml index 0c3356d..55cb646 100644 --- a/.gitea/workflows/app_builder.yaml +++ b/.gitea/workflows/app_builder.yaml @@ -42,9 +42,11 @@ jobs: - platform: "windows-latest" bundles: "nsis" updater_platform: "windows-x86_64" + no_strip: "" - platform: "ubuntu-22.04" bundles: "appimage" updater_platform: "linux-x86_64" + no_strip: "1" runs-on: ${{ matrix.platform }} @@ -65,6 +67,10 @@ jobs: with: node-version: lts/* + - name: install rust toolchain + if: matrix.platform == 'ubuntu-22.04' + uses: dtolnay/rust-toolchain@stable + - name: install frontend dependencies run: npm ci @@ -129,6 +135,7 @@ jobs: env: TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD}} + NO_STRIP: ${{ matrix.no_strip }} run: npm run tauri -- build --bundles ${{ matrix.bundles }} # ---------------------- # Upload to MinIO (via mc) and create latest.json diff --git a/cicd_tool/main.py b/cicd_tool/main.py index 9e03d81..9ebb4ef 100644 --- a/cicd_tool/main.py +++ b/cicd_tool/main.py @@ -115,16 +115,21 @@ def _ensure_bucket(client: Minio, bucket_name: str) -> None: def _collect_artifacts() -> List[Path]: artifacts: List[Path] = [] - for directory in ( - ARTIFACT_ROOT / "msi", - ARTIFACT_ROOT / "nsis", - ARTIFACT_ROOT / "appimage", - ARTIFACT_ROOT / "deb", - ARTIFACT_ROOT / "rpm", - ARTIFACT_ROOT / "app", - ): + bundle_dirs = { + ARTIFACT_ROOT / "msi": (".msi", ".sig"), + ARTIFACT_ROOT / "nsis": (".exe", ".sig"), + ARTIFACT_ROOT / "appimage": (".appimage", ".sig"), + ARTIFACT_ROOT / "deb": (".deb", ".sig"), + ARTIFACT_ROOT / "rpm": (".rpm", ".sig"), + ARTIFACT_ROOT / "app": (".dmg", ".zip", ".sig"), + } + for directory, suffixes in bundle_dirs.items(): if directory.exists(): - artifacts.extend(p for p in directory.rglob("*") if p.is_file()) + artifacts.extend( + p + for p in directory.iterdir() + if p.is_file() and p.suffix.lower() in suffixes + ) return artifacts