Merge develop into main: v0.1.0 → v0.1.40

.githooks/pre-push

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#
+# Auto-bump the patch version on every push of a branch, so each pushed build
+# is a distinct version. Releases stay manual (they are cut by pushing a v* tag,
+# which this hook deliberately skips).
+#
+# git can't add a commit to a push that is already in flight, so this hook:
+#   1. bumps package.json / Cargo.toml / tauri.conf.json / Cargo.lock,
+#   2. commits the bump onto the current branch,
+#   3. re-runs the push (which carries the bump), and
+#   4. aborts the original push, now superseded by the re-push.
+#
+# Enable once with:  git config core.hooksPath .githooks
+set -euo pipefail
+
+# Guard against the recursion from our own re-push below.
+[ -n "${ELDRUN_BUMPING:-}" ] && exit 0
+
+remote="$1"
+
+repo_root="$(git rev-parse --show-toplevel)"
+
+# stdin: <local-ref> <local-sha> <remote-ref> <remote-sha> per pushed ref.
+# Bump only when pushing a branch whose version still matches what is already on
+# the remote (or a brand-new remote branch). This skips:
+#   - pure tag / deletion pushes (e.g. `git push origin v0.1.8` to cut a release),
+#   - pushes where the version was already advanced manually (minor/major bump),
+# so the version on the remote strictly increases on each push without ever
+# double-bumping.
+pkg_version() { git show "$1:package.json" 2>/dev/null | jq -r '.version // empty' 2>/dev/null; }
+
+bump=0
+while read -r local_ref local_sha _remote_ref remote_sha; do
+  case "$local_ref" in
+    refs/tags/*|"") continue ;;   # tag or deletion — leave version alone
+    refs/*) : ;;
+    *) continue ;;
+  esac
+  if [[ "$remote_sha" =~ ^0+$ ]]; then
+    bump=1                        # new branch on the remote — give it a fresh version
+  elif [ "$(pkg_version "$local_sha")" = "$(pkg_version "$remote_sha")" ]; then
+    bump=1                        # version unchanged since last push — bump it
+  fi
+done
+
+[ "$bump" -eq 0 ] && exit 0
+
+new="$("$repo_root/scripts/bump-version.sh" patch)"
+
+# Cargo.lock carries the workspace's own version too, so it is part of the bump
+# — staged with the rest or the bump commit leaves the tree dirty behind it.
+# `--` and the explicit list keep this to the version files: a push must never
+# sweep up whatever else happens to be in the working tree.
+git -C "$repo_root" add -- \
+  package.json src-tauri/Cargo.toml src-tauri/tauri.conf.json Cargo.lock
+git -C "$repo_root" commit -m "chore: bump version to v${new}" >/dev/null
+
+echo "pre-push: bumped version to v${new}; pushing with the bump included…" >&2
+ELDRUN_BUMPING=1 git push "$remote" HEAD
+echo "pre-push: pushed v${new}. The 'failed to push' line below is the original" >&2
+echo "          pre-bump push being intentionally aborted — the push succeeded." >&2
+
+# The re-push above already sent the bump commit; stop the original (stale) push.
+exit 1

.github/workflows/ci-cd.yml

@@ -52,11 +52,9 @@ jobs:
       - name: Run backend tests
         run: cargo test --manifest-path src-tauri/Cargo.toml
 
-  package-windows:
-    name: package-windows
+  test-windows:
+    name: test-windows
     runs-on: windows-latest
-    if: github.event_name == 'push'
-    needs: test
 
     steps:
       - name: Checkout
@@ -79,9 +77,70 @@ jobs:
       - name: Install frontend dependencies
         run: npm ci
 
+      - name: Build frontend
+        run: npm run build
+
+      - name: Run backend tests
+        run: cargo test --manifest-path src-tauri/Cargo.toml
+
+  test-macos:
+    name: test-macos
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: npm
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: ./src-tauri -> target
+
+      - name: Install frontend dependencies
+        run: npm ci
+
+      - name: Build frontend
+        run: npm run build
+
       - name: Run backend tests
         run: cargo test --manifest-path src-tauri/Cargo.toml
 
+  package-windows:
+    name: package-windows
+    runs-on: windows-latest
+    if: github.event_name == 'push'
+    needs: test-windows
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: npm
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: ./src-tauri -> target
+
+      - name: Install frontend dependencies
+        run: npm ci
+
       - name: Build release bundles
         run: npm run tauri:build -- --bundles nsis
 
@@ -141,51 +200,181 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: eldrun-${{ github.sha }}-appimage
-          path: src-tauri/target/release/bundle/appimage/*.AppImage
+          # Project-root target/ is a fallback for when CARGO_TARGET_DIR is
+          # overridden by swatinem/rust-cache.
+          path: |
+            src-tauri/target/release/bundle/appimage/*.AppImage
+            target/release/bundle/appimage/*.AppImage
 
       - name: Upload DEB
         uses: actions/upload-artifact@v4
         with:
           name: eldrun-${{ github.sha }}-deb
-          path: src-tauri/target/release/bundle/deb/*.deb
+          # Project-root target/ is a fallback for when CARGO_TARGET_DIR is
+          # overridden by swatinem/rust-cache.
+          path: |
+            src-tauri/target/release/bundle/deb/*.deb
+            target/release/bundle/deb/*.deb
+
+  package-macos:
+    name: package-macos
+    runs-on: macos-latest
+    if: github.event_name == 'push'
+    needs: test-macos
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: npm
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-apple-darwin,aarch64-apple-darwin
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: ./src-tauri -> target
+
+      - name: Install frontend dependencies
+        run: npm ci
+
+      - name: Build release bundles
+        # Unsigned alpha .dmg (matches the unsigned Windows NSIS today). macOS
+        # bundle/window overrides come from src-tauri/tauri.macos.conf.json,
+        # which Tauri auto-merges on macOS. To ship a signed + notarized build
+        # later, import an Apple Developer cert into a keychain in a step above
+        # and set APPLE_SIGNING_IDENTITY + APPLE_ID + APPLE_PASSWORD +
+        # APPLE_TEAM_ID (or APPLE_API_KEY_ID/APPLE_API_ISSUER/APPLE_API_KEY_PATH)
+        # from repo secrets here before running the build.
+        run: npm run tauri:build -- --bundles dmg --target universal-apple-darwin
+
+      - name: Rename universal DMG
+        run: |
+          # Only one of these roots exists (rust-cache redirects CARGO_TARGET_DIR
+          # to the project root), and find exits 1 on the missing one — which the
+          # step's `bash -e` would treat as fatal before `test -n` ever runs.
+          dmg="$(find src-tauri/target target -path '*/universal-apple-darwin/release/bundle/dmg/*.dmg' -print -quit 2>/dev/null || true)"
+          test -n "$dmg"
+          # Name the published asset by version, like the AppImage/deb/exe
+          # bundles do — naming it by commit sha made the macOS asset the only
+          # one a user couldn't match to a release at a glance. Guard the move:
+          # Tauri may already emit exactly this name, and `mv x x` fails.
+          version="$(node -p "require('./package.json').version")"
+          target="$(dirname "$dmg")/Eldrun_${version}_universal.dmg"
+          [ "$dmg" = "$target" ] || mv "$dmg" "$target"
+
+      - name: Upload DMG
+        uses: actions/upload-artifact@v4
+        with:
+          name: eldrun-${{ github.sha }}-macos-universal-dmg
+          path: |
+            src-tauri/target/universal-apple-darwin/release/bundle/dmg/*universal.dmg
+            target/universal-apple-darwin/release/bundle/dmg/*universal.dmg
 
   release:
     name: release
     runs-on: ubuntu-22.04
-    if: startsWith(github.ref, 'refs/tags/v0.') && endsWith(github.ref, '.0')
-    needs: [package, package-windows]
+    needs: [package, package-windows, package-macos]
+    if: >-
+      always() &&
+      startsWith(github.ref, 'refs/tags/v') &&
+      (
+        needs.package.result == 'success' ||
+        needs.package-windows.result == 'success' ||
+        needs.package-macos.result == 'success'
+      )
     permissions:
       contents: write
 
     steps:
       - name: Download AppImage artifact
+        if: needs.package.result == 'success'
         uses: actions/download-artifact@v4
         with:
           name: eldrun-${{ github.sha }}-appimage
           path: release-assets
 
       - name: Download DEB artifact
+        if: needs.package.result == 'success'
         uses: actions/download-artifact@v4
         with:
           name: eldrun-${{ github.sha }}-deb
           path: release-assets
 
       - name: Download Windows NSIS artifact
+        if: needs.package-windows.result == 'success'
         uses: actions/download-artifact@v4
         with:
           name: eldrun-${{ github.sha }}-windows-nsis
           path: release-assets
 
+      - name: Download macOS DMG artifact
+        if: needs.package-macos.result == 'success'
+        uses: actions/download-artifact@v4
+        with:
+          name: eldrun-${{ github.sha }}-macos-universal-dmg
+          path: release-assets
+
+      - name: Build release notes
+        env:
+          RELEASE_TAG: ${{ github.ref_name }}
+          RELEASE_SHA: ${{ github.sha }}
+          LINUX_RESULT: ${{ needs.package.result }}
+          WINDOWS_RESULT: ${{ needs.package-windows.result }}
+          MACOS_RESULT: ${{ needs.package-macos.result }}
+        run: |
+          {
+            printf 'Eldrun %s — alpha / preview build.\n\n' "$RELEASE_TAG"
+            printf 'Built from commit `%s`.\n\n' "$RELEASE_SHA"
+            printf 'Artifacts:\n'
+
+            if [ "$LINUX_RESULT" = success ]; then
+              printf -- '- Linux: `.AppImage` (portable) and `.deb`\n'
+            else
+              printf -- '- Linux: unavailable (package job: `%s`)\n' "$LINUX_RESULT"
+            fi
+
+            if [ "$WINDOWS_RESULT" = success ]; then
+              printf -- '- Windows: NSIS `.exe` installer\n'
+            else
+              printf -- '- Windows: unavailable (package job: `%s`)\n' "$WINDOWS_RESULT"
+            fi
+
+            if [ "$MACOS_RESULT" = success ]; then
+              printf -- '- macOS: universal Intel/Apple Silicon `.dmg` (unsigned — right-click → Open, or run '
+              printf '`xattr -dr com.apple.quarantine /Applications/Eldrun.app`)\n'
+            else
+              printf -- '- macOS: unavailable (package job: `%s`)\n' "$MACOS_RESULT"
+            fi
+
+            printf '\nThis is an early alpha; expect rough edges.\n'
+          } > release-body.md
+
       - name: Publish GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
-          body: |
-            Eldrun release ${{ github.ref_name }}.
-
-            Built from commit ${{ github.sha }}.
+          # Publish as a full release so the newest tag becomes GitHub's
+          # "Latest" — a pre-release never does, which left the releases page
+          # with no latest build and the README's /releases/latest link stale.
+          # The notes still say alpha; this flag is about discoverability.
+          prerelease: false
+          body_path: release-body.md
+          fail_on_unmatched_files: false
+          # Recursive globs: the upload steps list two path patterns, so
+          # upload-artifact roots each artifact at the workspace dir and the
+          # bundle ends up nested (e.g. target/release/bundle/appimage/*.AppImage)
+          # rather than at the artifact root.
           files: |
-            release-assets/*.AppImage
-            release-assets/*.deb
-            release-assets/*.exe
+            release-assets/**/*.AppImage
+            release-assets/**/*.deb
+            release-assets/**/*.exe
+            release-assets/**/*.dmg

.gitignore

@@ -41,3 +41,11 @@ src-tauri/WixTools/
 
 # JSON backup files created by storage layer
 *.bak.json
+.env
+.env.local
+*.swp
+*.swo
+.idea/
+
+# Machine-list exports (contain real hostnames)
+eldrun-machines.json