Fix: Package misses required source files

.github/workflows/ci.yml

@@ -16,6 +16,17 @@ jobs:
         with:
             bins: cargo-nextest, cargo-insta@1.28.0
       - run: just test-unit
+  package-check:
+    name: cargo package check (opsqueue)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
+      - uses: extractions/setup-crate@4993624604c307fbca528d28a3c8b60fa5ecc859 # v1.4.0
+        with:
+          repo: casey/just
+          version: 1.42.4
+      - uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
+      - run: just package-check
   test-integration:
     name: Integration test (& build all in dev-mode)
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -31,6 +31,12 @@ repos:
         language: system
         types: [rust]
         pass_filenames: false
+      - id: sqlx-prepare-check
+        name: sqlx prepare --check (offline query cache fresh)
+        entry: just sqlx-check
+        language: system
+        files: ^opsqueue/(src/.*\.rs|migrations/.*\.sql|\.sqlx/.*)$
+        pass_filenames: false
       - id: nixfmt
         name: nixfmt
         entry: nixfmt --strict

Cargo.toml

@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.35.1"
+version = "0.35.2"
 
 [workspace.lints.clippy]
 cargo =  { level = "warn", priority = -1 }

justfile

@@ -101,3 +101,52 @@ nix-build-python: (_nix-build "python.pkgs.opsqueue_python")
 
 _nix-build +TARGETS:
   nix build --file nix/nixpkgs-pinned.nix --print-out-paths --print-build-logs --no-link --option sandbox true {{TARGETS}}
+
+# Verify `cargo package` for the opsqueue crate contains every file the lib +
+# bin + embedded migrations need at compile time. Catches regressions where the
+# `include` allow-list in opsqueue/Cargo.toml strips required files from the
+# published / vendored crate (broke downstream git-source consumers in the past).
+[group('test')]
+package-check:
+  #!/usr/bin/env bash
+  set -euo pipefail
+  files=$(cargo package -p opsqueue --list --allow-dirty)
+  required=(
+    "src/lib.rs"
+    "app/main.rs"
+    "build.rs"
+    "LICENSE"
+    "opsqueue_example_database_schema.db"
+  )
+  missing=()
+  for f in "${required[@]}"; do
+    if ! grep -qxF "$f" <<<"$files"; then
+      missing+=("$f")
+    fi
+  done
+  if ! grep -qE '^migrations/.*\.sql$' <<<"$files"; then
+    missing+=("migrations/*.sql")
+  fi
+  if ! grep -qE '^\.sqlx/query-.*\.json$' <<<"$files"; then
+    missing+=(".sqlx/query-*.json")
+  fi
+  if ((${#missing[@]})); then
+    echo "package-check: missing from cargo package output:" >&2
+    printf '  - %s\n' "${missing[@]}" >&2
+    exit 1
+  fi
+  cargo package -p opsqueue --no-verify --allow-dirty >/dev/null
+  echo "package-check: OK"
+
+# Verify the sqlx offline query cache (`opsqueue/.sqlx/`) is in sync with the
+# `query!`/`query_as!` invocations in the source tree. Required so downstream
+# offline (Crane/Nix) builds of the published crate that enable `server-logic`
+# can compile without a live SQLite database.
+[group('lint')]
+sqlx-check:
+  #!/usr/bin/env bash
+  set -euo pipefail
+  cd opsqueue
+  DATABASE_URL="sqlite://$PWD/opsqueue_example_database_schema.db" \
+    cargo sqlx prepare --check -- --all-targets
+  echo "sqlx-check: OK"