CI: sqlx setup

.github/workflows/pr-tests.yaml

@@ -19,6 +19,11 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Cache compilation artefacts
         uses: mozilla-actions/[email protected]
+      - name: Setup cargo-sqlx
+        run: cargo install sqlx-cli
+      - name: Setup sqlx database
+        run: mkdir -p target && cargo sqlx database setup
+
       - name: Cargo fmt
         run: cargo fmt --all -- --check
       - name: Run Trow test suite
@@ -41,6 +46,10 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Cache compilation artefacts
         uses: mozilla-actions/[email protected]
+      - name: Setup cargo-sqlx
+        run: cargo install sqlx-cli
+      - name: Setup sqlx database
+        run: mkdir -p target && cargo sqlx database setup
       - name: Build
         run: |
           cargo build

DEVELOPING.md

@@ -3,7 +3,7 @@
 ## sqlx setup
 
 To develop, build and test Trow, an sqlx development database is required.
-The TL;DR is `cargo sqlx database setup`, more information can be found at
+The TL;DR is `mkdir -p target && cargo sqlx database setup`, more information can be found at
 <https://github.com/launchbadge/sqlx/blob/main/sqlx-cli/README.md>.
 
 ## Using Docker/Podman

docker/Dockerfile

@@ -26,7 +26,7 @@ COPY .cargo/config.toml .cargo/config.toml
 COPY src src
 
 # Get rid of the "cp" when cargo build --out is stable
-RUN --mount=type=cache,target=./target \
+RUN --mount=type=bind,source=./target,target=./target \
     cargo build --release --target $(cat /.platform) && \
     cp /usr/src/trow/target/$(cat /.platform)/release/trow /usr/src/trow/
 

docker/multi-arch.sh

@@ -1,12 +1,40 @@
 #!/usr/bin/env bash
-set -eo pipefail
+set -exo pipefail
 
 # change to directory with script so we know where project root is
 src_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$src_dir"
 
 GH_REPO="ghcr.io/trow-registry/trow"
 
+# Check if cargo-sqlx is installed
+if ! command -v cargo-sqlx >/dev/null 2>&1; then
+    echo "→ sqlx-cli not found. Installing..."
+    if ! cargo install sqlx-cli; then
+        echo "Error: Failed to install sqlx-cli"
+        exit 1
+    fi
+    echo "→ sqlx-cli installed successfully"
+else
+    echo "→ sqlx-cli is already installed"
+fi
+
+# Check if development database exists
+DB_PATH="$src_dir/target/dev.db"
+if [ ! -f "$DB_PATH" ]; then
+    echo "→ Development database not found. Setting up..."
+    cd "$src_dir/.."
+    mkdir -p target
+    if ! cargo sqlx database setup; then
+        echo "Error: Failed to setup database"
+        exit 1
+    fi
+    cd "$src_dir"
+    echo "→ Database setup completed"
+else
+    echo "→ Development database already exists at $DB_PATH"
+fi
+
 # Use trow-multi builder if it exists, otherwise create it
 if ! docker buildx ls | grep -s trow-multi ;
 then