CI - Cache more of our build outputs

.dockerignore

@@ -1,3 +0,0 @@
-**/target
-# we do our own version pinning in the Dockerfile
-rust-toolchain.toml

.github/workflows/ci.yml

@@ -27,6 +27,8 @@ jobs:
           - { runner: windows-latest, smoketest_args: --no-build-cli }
         runner: [ spacetimedb-runner, windows-latest ]
     runs-on: ${{ matrix.runner }}
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - name: Find Git ref
         env:
@@ -45,6 +47,15 @@ jobs:
         with:
           ref: ${{ env.GIT_REF }}
       - uses: dsherret/rust-toolchain-file@v1
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          cache-on-failure: true
+          cache-all-crates: true
+          cache-workspace-crates: true
+
       - uses: actions/setup-dotnet@v4
         with:
           global-json-file: global.json
@@ -63,6 +74,8 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install psql -y --no-progress
         shell: powershell
+      - name: Build crates
+        run: cargo build -p spacetimedb-cli -p spacetimedb-standalone -p spacetimedb-update
       - name: Build and start database (Linux)
         if: runner.os == 'Linux'
         run: docker compose up -d
@@ -73,7 +86,6 @@ jobs:
           $ErrorActionPreference = 'Stop'
           $PSNativeCommandUseErrorActionPreference = $true
 
-          cargo build -p spacetimedb-cli -p spacetimedb-standalone -p spacetimedb-update
           Start-Process target/debug/spacetimedb-cli.exe -ArgumentList 'start --pg-port 5432'
           cd modules
           # the sdk-manifests on windows-latest are messed up, so we need to update them
@@ -94,6 +106,8 @@ jobs:
   test:
     name: Test Suite
     runs-on: spacetimedb-runner
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - name: Find Git ref
         env:
@@ -113,6 +127,13 @@ jobs:
           ref: ${{ env.GIT_REF }}
 
       - uses: dsherret/rust-toolchain-file@v1
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the smoketests job save the cache since it builds the most things
+          save-if: false
 
       - uses: actions/setup-dotnet@v3
         with:
@@ -158,13 +179,23 @@ jobs:
   lints:
     name: Lints
     runs-on: spacetimedb-runner
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
 
       - uses: dsherret/rust-toolchain-file@v1
       - run: echo ::add-matcher::.github/workflows/rust_matcher.json
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the smoketests job save the cache since it builds the most things
+          save-if: false
+
       - uses: actions/setup-dotnet@v3
         with:
           global-json-file: global.json
@@ -197,12 +228,22 @@ jobs:
   wasm_bindings:
     name: Build and test wasm bindings
     runs-on: spacetimedb-runner
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - uses: actions/checkout@v3
 
       - uses: dsherret/rust-toolchain-file@v1
       - run: echo ::add-matcher::.github/workflows/rust_matcher.json
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the smoketests job save the cache since it builds the most things
+          save-if: false
+
       - name: Run bindgen tests
         run: cargo test -p spacetimedb-codegen
 
@@ -374,6 +415,8 @@ jobs:
     name: Check CLI docs
     permissions: read-all
     runs-on: ubuntu-latest
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - name: Find Git ref
         env:
@@ -417,6 +460,14 @@ jobs:
 
       - uses: dsherret/rust-toolchain-file@v1
 
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the smoketests job save the cache since it builds the most things
+          save-if: false
+
       - name: Check for docs change
         run: |
           cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md

.github/workflows/csharp-test.yml

@@ -18,6 +18,8 @@ jobs:
       group: unity-test-${{ github.event.pull_request.number || github.ref }}
       cancel-in-progress: true
     timeout-minutes: 30
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
     steps:
       - name: Checkout repository
         id: checkout-stdb
@@ -65,26 +67,18 @@ jobs:
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
-        id: cache-rust-deps
         with:
-          workspaces: demo/Blackholio/server-rust
-          key: ${{ steps.checkout-stdb.outputs.commit }}
-          # Cache Rust deps even if unit tests have failed.
-          cache-on-failure: true
-          # Cache the CLI as well.
-          cache-all-crates: true
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the main CI job save the cache since it builds the most things
+          save-if: false
 
       - name: Install SpacetimeDB CLI from the local checkout
-        # Rebuild only if we didn't get a precise cache hit.
-        if: steps.cache-rust-deps.outputs.cache-hit == 'false'
         run: |
           cargo install --force --path crates/cli --locked --message-format=short
           cargo install --force --path crates/standalone --locked --message-format=short
           # Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
           ln -sf $HOME/.cargo/bin/spacetimedb-cli $HOME/.cargo/bin/spacetime
-        env:
-          # Share the target directory with our local project to avoid rebuilding same SpacetimeDB crates twice.
-          CARGO_TARGET_DIR: demo/Blackholio/server-rust/target
 
       - name: Check quickstart-chat bindings are up to date
         working-directory: sdks/csharp

.github/workflows/typescript-test.yml

@@ -14,6 +14,8 @@ concurrency:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    env:
+      CARGO_TARGET_DIR: ${{ github.workspace }}/target
 
     steps:
       - name: Checkout repository
@@ -81,10 +83,10 @@ jobs:
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: |
-            .
-            modules/quickstart-chat
-          shared-key: quickstart-chat-test
+          workspaces: ${{ github.workspace }}
+          shared-key: spacetimedb
+          # Let the main CI job save the cache since it builds the most things
+          save-if: false
 
       - name: Install SpacetimeDB CLI from the local checkout
         run: |

crates/standalone/Dockerfile

@@ -1,44 +1,7 @@
-ARG CARGO_PROFILE=release
-
-
-FROM rust:1.90.0 AS chef
-RUN rust_target=$(rustc -vV | awk '/^host:/{ print $2 }') && \
-  curl https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-$rust_target.tgz -fL | tar xz -C $CARGO_HOME/bin
-RUN cargo binstall -y cargo-chef@0.1.70
-WORKDIR /usr/src/app
-
-FROM chef AS planner
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM chef AS builder
-
-RUN cargo binstall -y cargo-watch@8.4.0
-RUN cargo binstall -y flamegraph@0.6.2
-
-COPY --from=planner /usr/src/app/recipe.json .
-
-ENV CARGO_INCREMENTAL=0
-
-ARG CARGO_PROFILE=release
-
-RUN cargo chef cook -p spacetimedb-standalone --profile=${CARGO_PROFILE}
-
-COPY . .
-RUN cargo build -p spacetimedb-standalone --profile=${CARGO_PROFILE} --locked
-
-FROM builder as env-dev
-RUN mkdir -p /stdb/data && ln -s /usr/src/app/crates/standalone/config.toml /stdb/data/config.toml
-ENV PATH="/usr/src/app/target/debug:${PATH}"
-
-FROM debian as env-release
-RUN apt-get update && \
-    apt-get install -y ca-certificates libssl-dev && \
-    rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/src/app/target/release/spacetimedb-standalone /usr/local/bin/
-COPY --from=builder /usr/src/app/crates/standalone/config.toml /stdb/data/config.toml
-
-FROM env-${CARGO_PROFILE}
+FROM rust:1.90.0
+RUN mkdir -p /stdb/data
+COPY ./target/debug/spacetimedb-standalone ./target/debug/spacetimedb-cli /usr/local/bin/
+COPY ./crates/standalone/config.toml /stdb/data/config.toml
 
 EXPOSE 3000
 

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       - "5432:5432"
       # Tracy
       - "8086:8086"
-    entrypoint: cargo watch -i flamegraphs -i log.conf --why -C crates/standalone -x 'run start --data-dir=/stdb/data --jwt-pub-key-path=/etc/spacetimedb/id_ecdsa.pub --jwt-priv-key-path=/etc/spacetimedb/id_ecdsa --pg-port 5432'
+    entrypoint: spacetimedb-standalone start --data-dir=/stdb/data --jwt-pub-key-path=/etc/spacetimedb/id_ecdsa.pub --jwt-priv-key-path=/etc/spacetimedb/id_ecdsa --pg-port 5432
     privileged: true
     environment:
       SPACETIMEDB_FLAMEGRAPH_PATH: ../../../../flamegraphs/flamegraph.folded