diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb08dd4..12d8398 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,19 +9,46 @@ permissions: contents: write jobs: - release: + create-release: + runs-on: ubuntu-latest + outputs: + release-id: ${{ steps.create.outputs.id }} + steps: + - name: Create draft release + id: create + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + TAG="${{ github.ref_name }}" + REPO="${{ github.repository }}" + gh release view "$TAG" --repo "$REPO" >/dev/null 2>&1 && \ + echo "id=$(gh release view "$TAG" --repo "$REPO" --json id --jq '.id')" >> "$GITHUB_OUTPUT" && \ + echo "Release already exists." && exit 0 + + gh release create "$TAG" \ + --repo "$REPO" \ + --title "Clustri $TAG" \ + --notes "See the assets below to download and install." \ + --draft --verify-tag --target main + echo "id=$(gh release view "$TAG" --repo "$REPO" --json id --jq '.id')" >> "$GITHUB_OUTPUT" + + build: + needs: create-release strategy: fail-fast: false matrix: include: - platform: ubuntu-22.04 - args: "" - - platform: windows-latest - args: "" - - platform: macos-latest - args: "--target universal-apple-darwin" + runner: ubuntu-22.04 + target: "" + - platform: windows + runner: windows-latest + target: "" + - platform: macos + runner: macos-latest + target: "--target universal-apple-darwin" - runs-on: ${{ matrix.platform }} + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 @@ -38,7 +65,7 @@ jobs: - name: Setup Rust uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} + targets: ${{ matrix.platform == 'macos' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - name: Rust cache uses: Swatinem/rust-cache@v2 @@ -51,41 +78,39 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - - name: Build and release - uses: tauri-apps/tauri-action@v1 + - name: Build + shell: bash env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - with: - tagName: ${{ github.ref_name }} - releaseName: "Clustri ${{ github.ref_name }}" - releaseBody: "See the assets below to download and install." - releaseDraft: true - prerelease: false - updaterJsonPreferNsis: true - args: ${{ matrix.args }} + run: npx tauri build ${{ matrix.target }} - - name: Upload updater artifacts + - name: Upload artifacts shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - RELEASE_TAG="${{ github.ref_name }}" + TAG="${{ github.ref_name }}" + REPO="${{ github.repository }}" - # Upload all .sig files from the entire target directory - find src-tauri/target -name "*.sig" -type f | while read sig_file; do - echo "Uploading $(basename "$sig_file")..." - gh release upload "$RELEASE_TAG" "$sig_file" --clobber --repo ${{ github.repository }} 2>/dev/null || true - done + upload() { + local file="$1" + if [ -f "$file" ]; then + echo "Uploading $(basename "$file")..." + gh release upload "$TAG" "$file" --clobber --repo "$REPO" || true + fi + } - # Upload updater bundles (.app.tar.gz, .nsis.zip, .msi.zip) - find src-tauri/target \( -name "*.app.tar.gz" -o -name "*.nsis.zip" -o -name "*.msi.zip" \) -type f | while read bundle_file; do - echo "Uploading $(basename "$bundle_file")..." - gh release upload "$RELEASE_TAG" "$bundle_file" --clobber --repo ${{ github.repository }} 2>/dev/null || true + find src-tauri/target -path "*/bundle/*" \( \ + -name "*.deb" -o -name "*.rpm" -o -name "*.AppImage" -o \ + -name "*.dmg" -o -name "*.app.tar.gz" -o -name "*.msi" -o \ + -name "*.exe" -o -name "*.nsis.zip" -o -name "*.msi.zip" -o \ + -name "*.sig" \ + \) -type f | while read f; do + upload "$f" done update-latest-json: - needs: release + needs: build runs-on: ubuntu-latest steps: - name: Generate and upload latest.json @@ -93,27 +118,31 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | python3 << 'PYEOF' - import json, subprocess, os, sys, tempfile + import json, subprocess, os, tempfile - TAG = os.environ.get("GITHUB_REF_NAME", "") - REPO = os.environ.get("GITHUB_REPOSITORY", "") - VERSION = TAG.lstrip("v") - BASE_URL = f"https://github.com/{REPO}/releases/download/{TAG}" + tag = os.environ["GITHUB_REF_NAME"] + repo = os.environ["GITHUB_REPOSITORY"] + version = tag.lstrip("v") + base_url = f"https://github.com/{repo}/releases/download/{tag}" def run(cmd): return subprocess.check_output(cmd, shell=True, text=True).strip() + data = json.loads(run(f'gh release view "{tag}" --repo "{repo}" --json assets')) + assets = {a["name"]: a for a in data["assets"]} + def find_asset(pattern): - data = json.loads(run(f'gh release view "{TAG}" --repo "{REPO}" --json assets')) - for a in data["assets"]: - if pattern in a["name"]: - return a["name"] + for name in assets: + if pattern in name: + return name return None - def download_asset(name): + def download_sig(name): + if not name: + return "" with tempfile.TemporaryDirectory() as d: subprocess.run( - f'gh release download "{TAG}" --repo "{REPO}" -p "{name}" -D "{d}"', + f'gh release download "{tag}" --repo "{repo}" -p "{name}" -D "{d}"', shell=True, capture_output=True ) path = os.path.join(d, name) @@ -125,45 +154,42 @@ jobs: platforms = {} # Linux AppImage - appimage = find_asset(".AppImage") - appimage_sig = find_asset(".AppImage.sig") - if appimage and appimage_sig: - sig = download_asset(appimage_sig) - if sig: - platforms["linux-x86_64"] = {"signature": sig, "url": f"{BASE_URL}/{appimage}"} + app = find_asset(".AppImage") + sig = find_asset(".AppImage.sig") + if app and sig: + s = download_sig(sig) + if s: + platforms["linux-x86_64"] = {"signature": s, "url": f"{base_url}/{app}"} # Windows NSIS - nsis = find_asset("-setup.exe") - nsis_sig = find_asset("nsis.zip.sig") - if nsis and nsis_sig: - sig = download_asset(nsis_sig) - if sig: - platforms["windows-x86_64"] = {"signature": sig, "url": f"{BASE_URL}/{nsis}"} + exe = find_asset("-setup.exe") + sig = find_asset("nsis.zip.sig") + if exe and sig: + s = download_sig(sig) + if s: + platforms["windows-x86_64"] = {"signature": s, "url": f"{base_url}/{exe}"} # macOS universal - macos = find_asset("app.tar.gz") - macos_sig = find_asset("app.tar.gz.sig") - if macos and macos_sig: - sig = download_asset(macos_sig) - if sig: - platforms["darwin-x86_64"] = {"signature": sig, "url": f"{BASE_URL}/{macos}"} - platforms["darwin-aarch64"] = {"signature": sig, "url": f"{BASE_URL}/{macos}"} + app = find_asset("app.tar.gz") + sig = find_asset("app.tar.gz.sig") + if app and sig: + s = download_sig(sig) + if s: + platforms["darwin-x86_64"] = {"signature": s, "url": f"{base_url}/{app}"} + platforms["darwin-aarch64"] = {"signature": s, "url": f"{base_url}/{app}"} latest = { - "version": VERSION, + "version": version, "notes": "See the assets below to download and install.", "pub_date": run("date -u +%Y-%m-%dT%H:%M:%SZ"), "platforms": platforms, } - with open("latest.json", "w") as f: + with open("/tmp/latest.json", "w") as f: json.dump(latest, f, indent=2) print(json.dumps(latest, indent=2)) - - subprocess.run( - f'gh release upload "{TAG}" latest.json --clobber --repo "{REPO}"', - shell=True, check=True - ) - print("latest.json uploaded successfully.") PYEOF + + gh release upload "${{ github.ref_name }}" /tmp/latest.json --clobber --repo "${{ github.repository }}" + echo "latest.json uploaded." diff --git a/src-tauri/target/.rustc_info.json b/src-tauri/target/.rustc_info.json deleted file mode 100644 index d63ba35..0000000 --- a/src-tauri/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":9200552825474144316,"outputs":{"7752308220390268658":{"success":true,"status":"","code":0,"stdout":"rustc 1.97.1 (8bab26f4f 2026-07-14)\nbinary: rustc\ncommit-hash: 8bab26f4f68e0e26f0bb7960be334d5b520ea452\ncommit-date: 2026-07-14\nhost: x86_64-unknown-linux-gnu\nrelease: 1.97.1\nLLVM version: 22.1.6\n","stderr":""},"7971740275564407648":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/user/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_primitive_alignment=\"16\"\ntarget_has_atomic_primitive_alignment=\"32\"\ntarget_has_atomic_primitive_alignment=\"64\"\ntarget_has_atomic_primitive_alignment=\"8\"\ntarget_has_atomic_primitive_alignment=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}} \ No newline at end of file diff --git a/src-tauri/target/CACHEDIR.TAG b/src-tauri/target/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/src-tauri/target/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/src-tauri/target/debug/.cargo-build-lock b/src-tauri/target/debug/.cargo-build-lock deleted file mode 100644 index e69de29..0000000 diff --git a/src-tauri/target/debug/.cargo-lock b/src-tauri/target/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/src-tauri/target/debug/.fingerprint/libc-19124a20af635abc/invoked.timestamp b/src-tauri/target/debug/.fingerprint/libc-19124a20af635abc/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/src-tauri/target/debug/.fingerprint/libc-19124a20af635abc/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/proc-macro2-28cd7e73fe64eada/invoked.timestamp b/src-tauri/target/debug/.fingerprint/proc-macro2-28cd7e73fe64eada/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/src-tauri/target/debug/.fingerprint/proc-macro2-28cd7e73fe64eada/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/quote-6dff9724e4e81362/invoked.timestamp b/src-tauri/target/debug/.fingerprint/quote-6dff9724e4e81362/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/src-tauri/target/debug/.fingerprint/quote-6dff9724e4e81362/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/serde_core-e613c711ddfe8493/invoked.timestamp b/src-tauri/target/debug/.fingerprint/serde_core-e613c711ddfe8493/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/src-tauri/target/debug/.fingerprint/serde_core-e613c711ddfe8493/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/dep-lib-unicode_ident b/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/dep-lib-unicode_ident deleted file mode 100644 index ec3cb8b..0000000 Binary files a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/dep-lib-unicode_ident and /dev/null differ diff --git a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/invoked.timestamp b/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident b/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident deleted file mode 100644 index 5c7ec14..0000000 --- a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident +++ /dev/null @@ -1 +0,0 @@ -4609aa34aaf3f167 \ No newline at end of file diff --git a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident.json b/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident.json deleted file mode 100644 index 718e584..0000000 --- a/src-tauri/target/debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/lib-unicode_ident.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":12019306335353385202,"features":"[]","declared_features":"[]","target":14045917370260632744,"profile":2225463790103693989,"path":11797909581934051219,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/unicode-ident-8443eb632a3fbe4c/dep-lib-unicode_ident","checksum":false}}],"rustflags":[],"config":9396254390672932401,"compile_kind":0} \ No newline at end of file diff --git a/src-tauri/target/debug/build/libc-19124a20af635abc/build_script_build-19124a20af635abc.d b/src-tauri/target/debug/build/libc-19124a20af635abc/build_script_build-19124a20af635abc.d deleted file mode 100644 index 7a71209..0000000 --- a/src-tauri/target/debug/build/libc-19124a20af635abc/build_script_build-19124a20af635abc.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/user/projects/dev/clustri/src-tauri/target/debug/build/libc-19124a20af635abc/build_script_build-19124a20af635abc.d: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.189/build.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/build/libc-19124a20af635abc/build_script_build-19124a20af635abc: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.189/build.rs - -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/libc-0.2.189/build.rs: diff --git a/src-tauri/target/debug/build/proc-macro2-28cd7e73fe64eada/build_script_build-28cd7e73fe64eada.d b/src-tauri/target/debug/build/proc-macro2-28cd7e73fe64eada/build_script_build-28cd7e73fe64eada.d deleted file mode 100644 index fea6f37..0000000 --- a/src-tauri/target/debug/build/proc-macro2-28cd7e73fe64eada/build_script_build-28cd7e73fe64eada.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/user/projects/dev/clustri/src-tauri/target/debug/build/proc-macro2-28cd7e73fe64eada/build_script_build-28cd7e73fe64eada.d: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.107/build.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/build/proc-macro2-28cd7e73fe64eada/build_script_build-28cd7e73fe64eada: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.107/build.rs - -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/proc-macro2-1.0.107/build.rs: diff --git a/src-tauri/target/debug/build/quote-6dff9724e4e81362/build_script_build-6dff9724e4e81362.d b/src-tauri/target/debug/build/quote-6dff9724e4e81362/build_script_build-6dff9724e4e81362.d deleted file mode 100644 index 33b37de..0000000 --- a/src-tauri/target/debug/build/quote-6dff9724e4e81362/build_script_build-6dff9724e4e81362.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/user/projects/dev/clustri/src-tauri/target/debug/build/quote-6dff9724e4e81362/build_script_build-6dff9724e4e81362.d: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/quote-1.0.47/build.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/build/quote-6dff9724e4e81362/build_script_build-6dff9724e4e81362: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/quote-1.0.47/build.rs - -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/quote-1.0.47/build.rs: diff --git a/src-tauri/target/debug/build/serde_core-e613c711ddfe8493/build_script_build-e613c711ddfe8493.d b/src-tauri/target/debug/build/serde_core-e613c711ddfe8493/build_script_build-e613c711ddfe8493.d deleted file mode 100644 index aa5c3ea..0000000 --- a/src-tauri/target/debug/build/serde_core-e613c711ddfe8493/build_script_build-e613c711ddfe8493.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/user/projects/dev/clustri/src-tauri/target/debug/build/serde_core-e613c711ddfe8493/build_script_build-e613c711ddfe8493.d: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/serde_core-1.0.229/build.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/build/serde_core-e613c711ddfe8493/build_script_build-e613c711ddfe8493: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/serde_core-1.0.229/build.rs - -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/serde_core-1.0.229/build.rs: diff --git a/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rlib b/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rlib deleted file mode 100644 index cd8b166..0000000 Binary files a/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rlib and /dev/null differ diff --git a/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rmeta b/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rmeta deleted file mode 100644 index f3ef464..0000000 Binary files a/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rmeta and /dev/null differ diff --git a/src-tauri/target/debug/deps/unicode_ident-8443eb632a3fbe4c.d b/src-tauri/target/debug/deps/unicode_ident-8443eb632a3fbe4c.d deleted file mode 100644 index fd1b76f..0000000 --- a/src-tauri/target/debug/deps/unicode_ident-8443eb632a3fbe4c.d +++ /dev/null @@ -1,8 +0,0 @@ -/home/user/projects/dev/clustri/src-tauri/target/debug/deps/unicode_ident-8443eb632a3fbe4c.d: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/lib.rs /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/tables.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rlib: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/lib.rs /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/tables.rs - -/home/user/projects/dev/clustri/src-tauri/target/debug/deps/libunicode_ident-8443eb632a3fbe4c.rmeta: /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/lib.rs /home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/tables.rs - -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/lib.rs: -/home/user/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/unicode-ident-1.0.24/src/tables.rs: