Rust: ready to merge

Author: zefhemel

.cargo/config.toml

@@ -32,7 +32,7 @@ linker = "arm-linux-gnueabihf-gcc"
 linker = "x86_64-w64-mingw32-gcc"
 
 # FreeBSD has no apt cross-gcc, so we cross with clang + a FreeBSD base sysroot
-# (extracted to /opt/freebsd-sysroot — see rust-edge-release.yml). clang is the
+# (extracted to /opt/freebsd-sysroot — see _build.yml). clang is the
 # link driver (with lld); the sysroot supplies FreeBSD's libc/crt + headers.
 [target.x86_64-unknown-freebsd]
 linker = "clang"

.github/workflows/ci.yml

@@ -22,8 +22,7 @@ permissions:
   contents: read
 
 jobs:
-  # Single source of truth for branch/channel decisions. Post-merge flip lives
-  # entirely in the TRANSITION CONFIG block below.
+  # Single source of truth for branch/channel decisions.
   config:
     runs-on: ubuntu-latest
     outputs:
@@ -42,23 +41,17 @@ jobs:
           REF: ${{ github.ref }}
         run: |
           set -euo pipefail
-          # ============ TRANSITION CONFIG (rust-backend → main) ============
-          # These values namespace the in-progress rust line so it never
-          # clobbers currently-published images/releases.
-          # NOTE: the website image intentionally diverges from the app image's
-          #   versioned channel — its edge channel is the plain :edge tag (not
-          #   :v2), with :latest reserved for tagged releases.
-          # POST-MERGE: set PUBLISH_BRANCH=main, GH_RELEASE_TAG=edge,
-          #   GH_RELEASE_NAME=Edge, DOCKER_EDGE_TAG=v2,
-          #   DOCKER_RUNTIME_API_TAG=v2-runtime-api, WEBSITE_TAG=edge,
-          #   then delete this comment.
-          PUBLISH_BRANCH="rust-backend"
-          GH_RELEASE_TAG="edge-rust"
-          GH_RELEASE_NAME="Edge (rust)"
-          DOCKER_EDGE_TAG="rust"
-          DOCKER_RUNTIME_API_TAG="rust-runtime-api"
-          WEBSITE_TAG="rust"
-          # =================================================================
+          # Channel configuration. Pushes to PUBLISH_BRANCH and manual dispatches
+          # publish the edge channel; git tags publish stable releases.
+          # The website image intentionally diverges from the app image's
+          # versioned channel — its edge channel is the plain :edge tag (not
+          # :v2), with :latest reserved for tagged releases.
+          PUBLISH_BRANCH="main"
+          GH_RELEASE_TAG="edge"
+          GH_RELEASE_NAME="Edge"
+          DOCKER_EDGE_TAG="v2"
+          DOCKER_RUNTIME_API_TAG="v2-runtime-api"
+          WEBSITE_TAG="edge"
 
           is_tag=false
           is_edge=false
@@ -131,9 +124,6 @@ jobs:
         run: make build
 
       - name: Install Playwright browsers
-        # --with-deps installs the OS libraries the browsers need (esp. webkit,
-        # which otherwise fails to launch on ubuntu-latest with "Host system is
-        # missing dependencies to run browsers").
         run: npx playwright install --with-deps
 
       - name: Run e2e tests
@@ -186,7 +176,7 @@ jobs:
           pattern: release-zips-*
           merge-multiple: true
 
-      # Branch / manual dispatch → refresh the namespaced edge prerelease.
+      # Branch / manual dispatch → refresh the rolling edge prerelease.
       - name: Publish edge prerelease
         if: needs.config.outputs.is_edge == 'true'
         uses: softprops/action-gh-release@v2

.gitignore

@@ -10,7 +10,7 @@ node_modules
 # Anchored to the repo root so it ignores the built `./silverbullet` binary
 # WITHOUT also swallowing the `bin/silverbullet/` Rust crate directory.
 /silverbullet
-# Cross-compiled musl binaries produced by the rust-edge Docker workflow.
+# Cross-compiled musl binaries produced by the CI Docker build (_build.yml).
 /silverbullet-amd64
 /silverbullet-arm64
 /sb

bin/sb/src/commands/upgrade.rs

@@ -19,8 +19,8 @@ use std::os::unix::fs::PermissionsExt;
 pub fn run(edge: bool) -> Result<(), String> {
     if edge {
         println!("Upgrading sb to edge...");
-        // The `edge` prerelease holds the latest Rust edge binaries (published by
-        // .github/workflows/rust-edge-release.yml on every push to `main`).
+        // The `edge` prerelease holds the latest edge binaries (published by
+        // .github/workflows/ci.yml on every push to `main`).
         upgrade_cli("https://github.com/silverbulletmd/silverbullet/releases/download/edge")
     } else {
         println!("Upgrading sb...");

website/Development.md

@@ -89,17 +89,27 @@ make fmt
 make test
 ```
 
-### Docker (early access)
-Multi-arch (amd64 + arm64) Docker images of the Rust server are published to the GitHub Container Registry on every push to the `rust-backend` branch (early access / unstable):
+### Docker
+Multi-arch (amd64 + arm64 + arm/v7) Docker images are published to Docker Hub
+and the GitHub Container Registry. The **edge** channel is rebuilt on every push
+to `main`; **stable** images come from git tags:
 
-* `ghcr.io/silverbulletmd/silverbullet:rust-edge` — the server (Alpine, static musl binary)
-* `ghcr.io/silverbulletmd/silverbullet:rust-edge-runtime-api` — the same, plus Chromium for the server-side Lua runtime (`/.runtime/*`)
+* `zefhemel/silverbullet:v2` (edge) / `:latest` + `:X.Y.Z` (stable) — the server
+  (Alpine, static musl binary)
+* `…:v2-runtime-api` (edge) / `:latest-runtime-api` + `:X.Y.Z-runtime-api`
+  (stable) — the same, plus Chromium for the server-side Lua runtime
+  (`/.runtime/*`)
+
+Both images are mirrored to `ghcr.io/silverbulletmd/silverbullet` under the same
+tags.
 
 To run one:
 
 ```shell
-docker run -p 3000:3000 -v <PATH-TO-YOUR-SPACE>:/space ghcr.io/silverbulletmd/silverbullet:rust-edge
+docker run -p 3000:3000 -v <PATH-TO-YOUR-SPACE>:/space zefhemel/silverbullet:v2
 ```
 
-These are built by `.github/workflows/rust-edge.yml`, which cross-compiles the binary natively (`cargo build --target` with installed musl cross-toolchains) and copies it into a small Alpine image.
+These are built by `.github/workflows/ci.yml`, which cross-compiles the binary
+natively (`cargo build --target` with installed musl cross-toolchains) and copies
+it into a small Alpine image.