Fix macOS installer release fallback

manuschillerdev · manuschillerdev · commit a0748e1e1452 · 2026-06-13T22:37:19.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,12 +4,19 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag to build and upload the macOS artifact for (for example, v0.1.0)'
+        required: true
+        type: string
 
 permissions:
   contents: write
 
 jobs:
   release:
+    if: github.event_name == 'push'
     runs-on: [self-hosted, linux, x64, kvm]
     steps:
       - name: Checkout
@@ -37,34 +44,68 @@ jobs:
 
   # The macOS server links cgo against Virtualization.framework, so it can't be
   # cross-compiled from the Linux release job — it builds on a macOS arm64 runner.
+  # The Linux release job creates a draft release first; this job uploads the
+  # macOS archive and publishes the release only after all artifacts are present.
+  # workflow_dispatch lets maintainers backfill the macOS artifact for an
+  # existing release tag if a prior release was published without it.
   release-darwin:
     needs: release
-    runs-on: macos-14
+    if: ${{ always() && ((github.event_name == 'push' && needs.release.result == 'success') || github.event_name == 'workflow_dispatch') }}
+    runs-on: [self-hosted, macos, arm64]
+    env:
+      RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ env.RELEASE_TAG }}
 
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
+          cache: false
           go-version: '1.25.4'
 
+      - name: Verify release exists
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release view "${RELEASE_TAG}" >/dev/null
+
       - name: Build server and token tool
         run: |
-          make build-darwin
+          make sign-darwin
           go build -o bin/hypeman-token ./cmd/gen-jwt
 
       - name: Package and upload darwin_arm64 archive
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          VERSION="${GITHUB_REF_NAME#v}"
+          set -euo pipefail
+
+          VERSION="${RELEASE_TAG#v}"
+          ARCHIVE_NAME="hypeman_${VERSION}_darwin_arm64.tar.gz"
           STAGE="$(mktemp -d)"
+          OUT="$(mktemp -d)"
+          EXISTING="$(mktemp -d)"
+
           cp bin/hypeman "${STAGE}/hypeman-api"
           cp bin/hypeman-token "${STAGE}/hypeman-token"
           cp config.example.darwin.yaml "${STAGE}/"
-          ARCHIVE="hypeman_${VERSION}_darwin_arm64.tar.gz"
-          tar -czf "${ARCHIVE}" -C "${STAGE}" .
-          gh release upload "${GITHUB_REF_NAME}" "${ARCHIVE}" --clobber
+
+          tar -czf "${OUT}/${ARCHIVE_NAME}" -C "${STAGE}" .
+
+          gh release download "${RELEASE_TAG}" -p checksums.txt -D "${EXISTING}"
+          grep -v "  ${ARCHIVE_NAME}$" "${EXISTING}/checksums.txt" > "${OUT}/checksums.next.txt" || true
+
+          CHECKSUM="$(shasum -a 256 "${OUT}/${ARCHIVE_NAME}" | awk '{print $1}')"
+          printf '%s  %s\n' "${CHECKSUM}" "${ARCHIVE_NAME}" >> "${OUT}/checksums.next.txt"
+          sort -k2 "${OUT}/checksums.next.txt" > "${OUT}/checksums.txt"
+
+          gh release upload "${RELEASE_TAG}" "${OUT}/${ARCHIVE_NAME}" "${OUT}/checksums.txt" --clobber
+
+      - name: Publish completed release
+        if: github.event_name == 'push'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release edit "${RELEASE_TAG}" --draft=false
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -81,4 +81,4 @@ release:
     owner: kernel
     name: hypeman
   prerelease: auto
-  draft: false
+  draft: true
diff --git a/README.md b/README.md
@@ -36,6 +36,9 @@
 
 ### macOS
 **macOS 11.0+** on Apple Silicon. Uses Apple's Virtualization.framework via the `vz` hypervisor.
+
+The full server installer uses a prebuilt macOS artifact when one is available. If not, it builds the server from source; install Xcode Command Line Tools, Go, and Make first. Docker is optional and only needed for build workloads.
+
 Install Rosetta to run `linux/amd64` images on Apple Silicon:
 
 ```bash
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -15,6 +15,9 @@
 #   DATA_DIR     - Data directory (default: /var/lib/hypeman on Linux, ~/Library/Application Support/hypeman on macOS)
 #   CONFIG_DIR   - Config directory (default: /etc/hypeman on Linux, ~/.config/hypeman on macOS)
 #
+# On macOS, when no prebuilt server artifact exists for the selected release,
+# the installer falls back to building that release from source.
+#
 
 set -e
 
@@ -67,6 +70,67 @@ find_release_with_artifact() {
     return 1
 }
 
+find_latest_release_tag() {
+    local repo="$1"
+
+    curl -fsSL "https://api.github.com/repos/${repo}/releases/latest" 2>/dev/null | grep '"tag_name"' | head -1 | cut -d'"' -f4
+}
+
+require_source_build_tools() {
+    command -v git >/dev/null 2>&1 || error "git is required to build from source but not installed"
+    command -v go >/dev/null 2>&1 || error "go is required to build from source but not installed"
+    command -v make >/dev/null 2>&1 || error "make is required to build from source but not installed"
+}
+
+build_server_from_source() {
+    local source_ref="$1"
+    local build_dir="${TMP_DIR}/hypeman"
+    local build_log="${TMP_DIR}/build.log"
+
+    require_source_build_tools
+
+    info "Building server from source (ref: ${source_ref})..."
+    : > "$build_log"
+
+    if ! git clone --branch "$source_ref" --depth 1 -q "https://github.com/${REPO}.git" "$build_dir" >> "$build_log" 2>&1; then
+        error "Failed to clone repository. Build log:\n$(cat "$build_log")"
+    fi
+
+    info "Building binaries (this may take a few minutes)..."
+    if [ "$OS" = "darwin" ]; then
+        if ! (cd "$build_dir" && make sign-darwin >> "$build_log" 2>&1); then
+            echo ""
+            echo -e "${RED}Build/signing failed. Full build log:${NC}"
+            cat "$build_log"
+            error "Build/signing failed"
+        fi
+        cp "${build_dir}/config.example.darwin.yaml" "${TMP_DIR}/config.example.darwin.yaml"
+    else
+        if ! (cd "$build_dir" && make build >> "$build_log" 2>&1); then
+            echo ""
+            echo -e "${RED}Build failed. Full build log:${NC}"
+            cat "$build_log"
+            error "Build failed"
+        fi
+        cp "${build_dir}/config.example.yaml" "${TMP_DIR}/config.example.yaml"
+    fi
+
+    cp "${build_dir}/bin/hypeman" "${TMP_DIR}/${BINARY_NAME}"
+    if [ "$OS" = "linux" ]; then
+        cp "${build_dir}/bin/${UFFD_PAGER_BINARY_NAME}" "${TMP_DIR}/${UFFD_PAGER_BINARY_NAME}"
+    fi
+
+    if ! (cd "$build_dir" && go build -o "${TMP_DIR}/hypeman-token" ./cmd/gen-jwt >> "$build_log" 2>&1); then
+        echo ""
+        echo -e "${RED}Build failed. Full build log:${NC}"
+        cat "$build_log"
+        error "Failed to build hypeman-token"
+    fi
+
+    VERSION="${source_ref} (source)"
+    info "Build complete"
+}
+
 # =============================================================================
 # Detect OS and architecture (before pre-flight checks)
 # =============================================================================
@@ -119,7 +183,6 @@ if [ "$OS" = "darwin" ]; then
         error "Intel Macs not supported"
     fi
     command -v codesign >/dev/null 2>&1 || error "codesign is required but not installed (install Xcode Command Line Tools)"
-    command -v docker >/dev/null 2>&1 || error "Docker CLI is required but not found. Install Docker via Colima or Docker Desktop."
     # Check if we need sudo for INSTALL_DIR
     if [ ! -w "$INSTALL_DIR" ] 2>/dev/null && [ ! -w "$(dirname "$INSTALL_DIR")" ] 2>/dev/null; then
         if command -v sudo >/dev/null 2>&1; then
@@ -164,11 +227,13 @@ if [ "$count" -gt 1 ]; then
     error "BRANCH, VERSION, and BINARY_DIR are mutually exclusive"
 fi
 
+if [ "${VERSION:-}" = "latest" ]; then
+    VERSION=""
+fi
+
 # Additional checks for build-from-source mode
 if [ -n "$BRANCH" ]; then
-    command -v git >/dev/null 2>&1 || error "git is required for BRANCH mode but not installed"
-    command -v go >/dev/null 2>&1 || error "go is required for BRANCH mode but not installed"
-    command -v make >/dev/null 2>&1 || error "make is required for BRANCH mode but not installed"
+    require_source_build_tools
 fi
 
 # Additional checks for BINARY_DIR mode
@@ -276,83 +341,39 @@ if [ -n "$BINARY_DIR" ]; then
 
     VERSION="custom (from binary)"
 elif [ -n "$BRANCH" ]; then
-    # Build from source mode
-    info "Building from source (branch: $BRANCH)..."
-
-    BUILD_DIR="${TMP_DIR}/hypeman"
-    BUILD_LOG="${TMP_DIR}/build.log"
-
-    # Clone repo (quiet)
-    if ! git clone --branch "$BRANCH" --depth 1 -q "https://github.com/${REPO}.git" "$BUILD_DIR" 2>&1 | tee -a "$BUILD_LOG"; then
-        error "Failed to clone repository. Build log:\n$(cat "$BUILD_LOG")"
-    fi
-
-    info "Building binaries (this may take a few minutes)..."
-    cd "$BUILD_DIR"
-
-    if ! make build >> "$BUILD_LOG" 2>&1; then
-        echo ""
-        echo -e "${RED}Build failed. Full build log:${NC}"
-        cat "$BUILD_LOG"
-        error "Build failed"
-    fi
-    if [ "$OS" = "darwin" ]; then
-        if ! make sign-darwin >> "$BUILD_LOG" 2>&1; then
-            echo ""
-            echo -e "${RED}Signing failed. Full build log:${NC}"
-            cat "$BUILD_LOG"
-            error "Signing failed"
-        fi
-        cp "config.example.darwin.yaml" "${TMP_DIR}/config.example.darwin.yaml"
-    else
-        cp "config.example.yaml" "${TMP_DIR}/config.example.yaml"
-    fi
-    cp "bin/hypeman" "${TMP_DIR}/${BINARY_NAME}"
-    if [ "$OS" = "linux" ]; then
-        cp "bin/${UFFD_PAGER_BINARY_NAME}" "${TMP_DIR}/${UFFD_PAGER_BINARY_NAME}"
-    fi
-
-    # Build hypeman-token (not included in make build)
-    if ! go build -o "${TMP_DIR}/hypeman-token" ./cmd/gen-jwt >> "$BUILD_LOG" 2>&1; then
-        echo ""
-        echo -e "${RED}Build failed. Full build log:${NC}"
-        cat "$BUILD_LOG"
-        error "Failed to build hypeman-token"
-    fi
-
-    VERSION="$BRANCH (source)"
-    cd - > /dev/null
-
-    info "Build complete"
+    build_server_from_source "$BRANCH"
 else
     # Download release mode
     if [ -z "$VERSION" ]; then
-        info "Fetching latest version with available artifacts..."
-        VERSION=$(find_release_with_artifact "$REPO" "hypeman" "$OS" "$ARCH")
-        if [ -z "$VERSION" ]; then
-            error "Failed to find a release with artifacts for ${OS}/${ARCH}"
+        if [ "$OS" = "darwin" ]; then
+            info "Fetching latest release..."
+            VERSION=$(find_latest_release_tag "$REPO" || true)
+            [ -n "$VERSION" ] || error "Failed to find the latest release"
+        else
+            info "Fetching latest version with available artifacts..."
+            VERSION=$(find_release_with_artifact "$REPO" "hypeman" "$OS" "$ARCH")
+            [ -n "$VERSION" ] || error "Failed to find a release with artifacts for ${OS}/${ARCH}"
         fi
     fi
-    info "Installing version: $VERSION"
 
-    # Construct download URL
-    VERSION_NUM="${VERSION#v}"
-    ARCHIVE_NAME="hypeman_${VERSION_NUM}_${OS}_${ARCH}.tar.gz"
-    DOWNLOAD_URL="https://github.com/${REPO}/releases/download/${VERSION}/${ARCHIVE_NAME}"
+    if [ ! -f "${TMP_DIR}/${BINARY_NAME}" ]; then
+        info "Installing version: $VERSION"
 
-    info "Downloading ${ARCHIVE_NAME}..."
-    if ! curl -fsSL "$DOWNLOAD_URL" -o "${TMP_DIR}/${ARCHIVE_NAME}"; then
-        error "Failed to download from ${DOWNLOAD_URL}"
-    fi
+        # Construct download URL
+        VERSION_NUM="${VERSION#v}"
+        ARCHIVE_NAME="hypeman_${VERSION_NUM}_${OS}_${ARCH}.tar.gz"
+        DOWNLOAD_URL="https://github.com/${REPO}/releases/download/${VERSION}/${ARCHIVE_NAME}"
 
-    info "Extracting..."
-    tar -xzf "${TMP_DIR}/${ARCHIVE_NAME}" -C "$TMP_DIR"
+        info "Downloading ${ARCHIVE_NAME}..."
+        if curl -fsSL "$DOWNLOAD_URL" -o "${TMP_DIR}/${ARCHIVE_NAME}"; then
+            info "Extracting..."
+            tar -xzf "${TMP_DIR}/${ARCHIVE_NAME}" -C "$TMP_DIR"
 
-    # On macOS, codesign after extraction with virtualization entitlements
-    if [ "$OS" = "darwin" ]; then
-        info "Signing binaries..."
-        ENTITLEMENTS_TMP="${TMP_DIR}/vz.entitlements"
-        cat > "$ENTITLEMENTS_TMP" << 'ENTITLEMENTS'
+            # On macOS, codesign after extraction with virtualization entitlements
+            if [ "$OS" = "darwin" ]; then
+                info "Signing binaries..."
+                ENTITLEMENTS_TMP="${TMP_DIR}/vz.entitlements"
+                cat > "$ENTITLEMENTS_TMP" << 'ENTITLEMENTS'
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -366,10 +387,18 @@ else
 </dict>
 </plist>
 ENTITLEMENTS
-        if ! codesign --force --sign - --entitlements "$ENTITLEMENTS_TMP" "${TMP_DIR}/${BINARY_NAME}" 2>/dev/null; then
-            warn "codesign failed — vz hypervisor will not work without virtualization entitlement"
+                if ! codesign --force --sign - --entitlements "$ENTITLEMENTS_TMP" "${TMP_DIR}/${BINARY_NAME}" 2>/dev/null; then
+                    warn "codesign failed — vz hypervisor will not work without virtualization entitlement"
+                fi
+                rm -f "$ENTITLEMENTS_TMP"
+            fi
+        elif [ "$OS" = "darwin" ]; then
+            rm -f "${TMP_DIR}/${ARCHIVE_NAME}"
+            warn "Prebuilt macOS server artifact ${ARCHIVE_NAME} could not be downloaded; building ${VERSION} from source instead"
+            build_server_from_source "$VERSION"
+        else
+            error "Failed to download from ${DOWNLOAD_URL}"
         fi
-        rm -f "$ENTITLEMENTS_TMP"
     fi
 fi
 
@@ -646,7 +675,7 @@ fi
 if [ "$OS" = "darwin" ]; then
     info "Attempting to build builder image..."
     if command -v docker >/dev/null 2>&1; then
-        if [ -n "$BRANCH" ] && [ -d "${TMP_DIR}/hypeman" ]; then
+        if [ -d "${TMP_DIR}/hypeman" ]; then
             BUILD_CONTEXT="${TMP_DIR}/hypeman"
         else
             BUILD_CONTEXT=""
