Add: Update dist to latest.

     Switch to a use dist workspace instead of manual edits to release.yml.
     Change builder to run from any directory.

Author: bjones1

.github/workflows/release.yml

@@ -77,7 +77,6 @@ jobs:
       # but also really annoying to build CI around when it needs secrets to work right.)
       - id: plan
         run: |
-          cd server
           dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
           echo "dist ran successfully"
           cat plan-dist-manifest.json
@@ -86,7 +85,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: artifacts-plan-dist-manifest
-          path: server/plan-dist-manifest.json
+          path: plan-dist-manifest.json
 
   # Build and packages all the platform-specific things
   build-local-artifacts:
@@ -145,11 +144,10 @@ jobs:
           ${{ matrix.packages_install }}
       - name: Build artifacts
         run: |
-          cd server
-          ./bt prerelease
+          builder/bt prerelease
           # Actually do builds and make zips and whatnot
           dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
-          ./bt postrelease ${{ matrix.dist_args }}
+          builder/bt postrelease ${{ matrix.dist_args }}
           echo "dist ran successfully"
       - id: cargo-dist
         name: Post-build
@@ -158,7 +156,6 @@ jobs:
         # inconsistent syntax between shell and powershell.
         shell: bash
         run: |
-          cd server
           # Parse out what we just built and upload it to scratch storage
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
           dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT"
@@ -201,7 +198,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
-          path: server/target/distrib/
+          path: target/distrib/
           merge-multiple: true
       - id: cargo-dist
         shell: bash
@@ -256,12 +253,11 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
-          path: server/target/distrib/
+          path: target/distrib/
           merge-multiple: true
       - id: host
         shell: bash
         run: |
-          cd server
           dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
           echo "artifacts uploaded and released successfully"
           cat dist-manifest.json
@@ -271,7 +267,7 @@ jobs:
         with:
           # Overwrite the previous copy
           name: artifacts-dist-manifest
-          path: server/dist-manifest.json
+          path: dist-manifest.json
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
         uses: actions/download-artifact@v4

builder/Cargo.toml

@@ -27,5 +27,6 @@ edition = "2024"
 clap = { version = "4.5.19", features = ["derive"] }
 cmd_lib = "1.9.5"
 current_platform = "0.2.0"
+dunce = "1.0.5"
 path-slash = "0.2.1"
 regex = "1.11.1"

builder/src/main.rs

@@ -32,6 +32,7 @@
 //
 // ### Standard library
 use std::{
+    env,
     ffi::OsStr,
     fs, io,
     path::{Path, PathBuf},
@@ -42,6 +43,7 @@ use std::{
 use clap::{Parser, Subcommand};
 use cmd_lib::run_cmd;
 use current_platform::CURRENT_PLATFORM;
+use dunce::canonicalize;
 use path_slash::PathBufExt;
 use regex::Regex;
 
@@ -575,6 +577,13 @@ impl Cli {
 }
 
 fn main() -> io::Result<()> {
+    // Change to the `server/` directory, so it can be run from anywhere.
+    let mut root_path = PathBuf::from(env::current_exe().unwrap().parent().unwrap());
+    root_path.push("../../../server");
+    // Use `dunce.canonicalize`, since UNC paths booger up some of the build tools (cargo can't delete the builder's binary, NPM doesn't accept UNC paths.)
+    root_path = canonicalize(root_path).unwrap();
+    env::set_current_dir(root_path).unwrap();
+
     let cli = Cli::parse();
     cli.run()?;
 

server/dist-workspace.toml dist-workspace.tomlserver/dist-workspace.toml renamed to dist-workspace.toml

@@ -20,19 +20,17 @@
 # [cargo-dist](https://opensource.axo.dev/cargo-dist/)
 # ====================================================
 [workspace]
-members = ["cargo:."]
+members = ["cargo:server/"]
 
 # Config for 'dist'
 [dist]
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
 cargo-dist-version = "0.29.0"
-# Extra static files to include in each App (path relative to this Cargo.toml's dir)
-include = ["log4rs.yml", "hashLocations.json", "../client/static"]
+# CI backends to support
+ci = "github"
 # The installers to generate for each app
 installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
-# CI backends to support
-ci = "github"
 # Skip checking whether the specified configuration files are up to date
 allow-dirty = ["ci"]

server/Cargo.toml

@@ -26,6 +26,7 @@ authors = ["Bryan A. Jones", "Peter Loux"]
 categories = ["development-tools", "text-editors"]
 description = "A programmer's word processor."
 edition = "2024"
+homepage = "https://codechat-editor.onrender.com"
 keywords = ["literate programming"]
 license = "GPL-3.0-only"
 name = "codechat-editor-server"

server/bt.ps1

@@ -19,4 +19,6 @@
 # # `bt` -- Shortcut to run the CodeChat Editor build tool
 
 # See [passing all command-line arguments](https://www.scivision.dev/powershell-pass-all-command-args/).
-cargo run --manifest-path=../builder/Cargo.toml -- $args
+$manifest_path = Join-Path -Path $PSScriptRoot -ChildPath ../builder/Cargo.toml
+echo $manifest_path
+cargo run --manifest-path=$manifest_path -- $args

server/dist.toml

@@ -0,0 +1,30 @@
+# Copyright (C) 2025 Bryan A. Jones.
+#
+# This file is part of the CodeChat Editor.
+#
+# The CodeChat Editor is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# The CodeChat Editor is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# the CodeChat Editor. If not, see
+# [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).
+#
+# `dist.toml` - Configure
+# [cargo-dist](https://opensource.axo.dev/cargo-dist/)
+# ====================================================
+# Config for 'dist'
+[dist]
+# Extra static files to include in each App (path relative to this Cargo.toml's dir)
+include = ["log4rs.yml", "hashLocations.json", "../client/static"]
+
+[package]
+# These files are relative to the root `dist-workspace.toml`, not to this file.
+changelog = "docs/changelog.md"
+license-files = ["LICENSE.md"]