Merge pull request #319 from NillionNetwork/fix/migration-conolisdation-error

Author: tim-hm

.github/workflows/cd-nildb-image.yaml

@@ -17,6 +17,7 @@ permissions:
 jobs:
   setup:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     outputs:
       short_sha: ${{ steps.vars.outputs.short_sha }}
     steps:
@@ -27,6 +28,7 @@ jobs:
   build-and-push-arch:
     needs: setup
     runs-on: ${{ matrix.runner }}
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -65,7 +67,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./packages/nildb/Dockerfile
+          file: ./packages/api/Dockerfile
           platforms: ${{ matrix.platform }}
           push: true
           tags: public.ecr.aws/k5d9x2g2/nildb-api:${{ needs.setup.outputs.short_sha }}-${{ matrix.arch }}
@@ -75,6 +77,7 @@ jobs:
 
   create-and-push-manifest:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     needs: [setup, build-and-push-arch]
     steps:
       - name: Checkout
@@ -117,6 +120,7 @@ jobs:
   deploy-to-ci-cluster:
     needs: [setup, create-and-push-manifest]
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     if: github.ref_name == 'main'
     strategy:
       matrix:

.github/workflows/ci.yaml

@@ -13,6 +13,7 @@ concurrency:
 jobs:
   check:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -26,6 +27,7 @@ jobs:
   test:
     needs: check
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4

biome.jsonc

@@ -7,7 +7,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**/*.ts", "packages/nildb/migrations/*.mjs", "**/*.json"]
+    "includes": ["**/*.ts", "packages/api/migrations/*.mjs", "**/*.json"]
   },
   "formatter": {
     "enabled": true,
@@ -22,13 +22,7 @@
       "correctness": {
         "recommended": true,
         "noUnusedImports": "error",
-        "noUnusedVariables": "error",
-        "useImportExtensions": {
-          "level": "error",
-          "options": {
-            "forceJsExtensions": true
-          }
-        }
+        "noUnusedVariables": "error"
       },
       "style": {
         "noParameterAssign": "error",
@@ -41,7 +35,14 @@
         "noUnusedTemplateLiteral": "error",
         "useNumberNamespace": "error",
         "noInferrableTypes": "error",
-        "noUselessElse": "error"
+        "noUselessElse": "error",
+        "useFilenamingConvention": {
+          "level": "error",
+          "options": {
+            "requireAscii": true,
+            "filenameCases": ["kebab-case"]
+          }
+        }
       },
       "nursery": {
         "noImportCycles": "error"
@@ -56,7 +57,7 @@
   },
   "overrides": [
     {
-      "includes": ["./packages/nildb/tests/**/*.ts"],
+      "includes": ["./packages/api/tests/**/*.ts"],
       "linter": {
         "rules": {
           "style": {

justfile

@@ -70,7 +70,7 @@ test-coverage:
 # Create build info aretefact for Docker
 create-buildinfo:
     #!/usr/bin/env bash
-    VERSION=$(cat packages/nildb/package.json | jq -r .version)
+    VERSION=$(cat packages/api/package.json | jq -r .version)
     cat << EOF > buildinfo.json
     {
       "time": "$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
@@ -83,7 +83,7 @@ create-buildinfo:
 docker-build-local: create-buildinfo
     docker buildx build \
       --tag public.ecr.aws/k5d9x2g2/nildb-api:local \
-      --file ./packages/nildb/Dockerfile \
+      --file ./packages/api/Dockerfile \
       .
 
 # ------------------

packages/nildb/Dockerfile packages/api/Dockerfilepackages/nildb/Dockerfile renamed to packages/api/Dockerfile

@@ -13,6 +13,7 @@ FROM node:24-alpine
 RUN corepack enable pnpm
 WORKDIR /app
 COPY --from=builder /app .
+COPY --from=builder /build/packages/api/migrations /migrations
 
 USER node
 EXPOSE 8080