diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f433c795..05a7d18e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,13 @@ jobs: - uses: oven-sh/setup-bun@v2 - run: bun install --frozen-lockfile - run: bun run lint + # The Contember CLI refuses to migrate when its version differs from @contember/schema. + - name: Check Contember image versions match @contember/schema + run: | + schema=$(jq -r .version node_modules/@contember/schema/package.json) + for tag in $(grep -ohE 'contember/(engine|cli):[^ ]+' .github/workflows/ci.yml docker-compose.yaml | cut -d: -f2); do + [ "$tag" = "$schema" ] || { echo "Contember image $tag does not match @contember/schema $schema"; exit 1; } + done typecheck: name: Typecheck @@ -61,7 +68,7 @@ jobs: - 9000:8000 contember-engine: - image: contember/engine:2.1.0-rc.4 + image: contember/engine:2.1.0-rc.6 env: NODE_ENV: development CONTEMBER_PORT: "4000" @@ -114,7 +121,7 @@ jobs: -e CONTEMBER_PROJECT_NAME=example \ -v ${{ github.workspace }}:/src \ -w /src/packages/example \ - contember/cli:2.1.0-rc.4 \ + contember/cli:2.1.0-rc.6 \ migrations:execute --yes CONTEMBER_API_URL=http://localhost:1581 CONTEMBER_API_TOKEN=0000000000000000000000000000000000000000 bun run packages/example/seed.ts diff --git a/bun.lock b/bun.lock index 1a73bb7f..93309ced 100644 --- a/bun.lock +++ b/bun.lock @@ -27,16 +27,16 @@ "version": "0.1.55", "dependencies": { "@contember/bindx-client": "workspace:*", - "@contember/graphql-client": "^2.1.0-beta.1", + "@contember/graphql-client": "2.1.0-rc.6", }, }, "packages/bindx-client": { "name": "@contember/bindx-client", "version": "0.1.55", "dependencies": { - "@contember/graphql-builder": "^2.1.0-beta.1", - "@contember/graphql-client": "^2.1.0-beta.1", - "@contember/schema": "^2.1.0-beta.1", + "@contember/graphql-builder": "2.1.0-rc.6", + "@contember/graphql-client": "2.1.0-rc.6", + "@contember/schema": "2.1.0-rc.6", }, }, "packages/bindx-dataview": { @@ -83,8 +83,8 @@ "name": "@contember/bindx-generator", "version": "0.1.55", "dependencies": { - "@contember/schema": "^2.1.0-beta.1", - "@contember/schema-utils": "^2.1.0-beta.1", + "@contember/schema": "2.1.0-rc.6", + "@contember/schema-utils": "2.1.0-rc.6", }, "devDependencies": { "@types/node": "^25.0.3", @@ -96,7 +96,7 @@ "dependencies": { "@contember/bindx": "workspace:*", "@contember/bindx-client": "workspace:*", - "@contember/graphql-client": "^2.1.0-beta.1", + "@contember/graphql-client": "2.1.0-rc.6", "@radix-ui/primitive": "^1.1.3", "@radix-ui/react-slot": "^1.2.4", }, @@ -181,10 +181,10 @@ "@contember/bindx-repeater": "workspace:*", "@contember/bindx-ui": "workspace:*", "@contember/bindx-uploader": "workspace:*", - "@contember/client-content": "^2.1.0-beta.1", - "@contember/graphql-client": "^2.1.0-beta.1", - "@contember/schema": "^2.1.0-beta.1", - "@contember/schema-definition": "^2.1.0-beta.1", + "@contember/client-content": "2.1.0-rc.6", + "@contember/graphql-client": "2.1.0-rc.6", + "@contember/schema": "2.1.0-rc.6", + "@contember/schema-definition": "2.1.0-rc.6", "@tailwindcss/vite": "^4.2.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/docker-compose.yaml b/docker-compose.yaml index 23f099bd..4002efe4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ services: contember-engine: - image: contember/engine:2.1.0-rc.4 + image: contember/engine:2.1.0-rc.6 environment: NODE_ENV: 'development' @@ -43,7 +43,7 @@ services: condition: service_healthy contember-cli: - image: contember/cli:2.1.0-rc.4 + image: contember/cli:2.1.0-rc.6 user: '1000:1000' deploy: diff --git a/packages/bindx-client/package.json b/packages/bindx-client/package.json index a94d786a..17ec3cee 100644 --- a/packages/bindx-client/package.json +++ b/packages/bindx-client/package.json @@ -17,9 +17,9 @@ ], "license": "MIT", "dependencies": { - "@contember/graphql-builder": "^2.1.0-beta.1", - "@contember/graphql-client": "^2.1.0-beta.1", - "@contember/schema": "^2.1.0-beta.1" + "@contember/graphql-builder": "2.1.0-rc.6", + "@contember/graphql-client": "2.1.0-rc.6", + "@contember/schema": "2.1.0-rc.6" }, "repository": { "type": "git", diff --git a/packages/bindx-generator/package.json b/packages/bindx-generator/package.json index a1ad7d27..8c8a8e23 100644 --- a/packages/bindx-generator/package.json +++ b/packages/bindx-generator/package.json @@ -17,8 +17,8 @@ ], "license": "MIT", "dependencies": { - "@contember/schema": "^2.1.0-beta.1", - "@contember/schema-utils": "^2.1.0-beta.1" + "@contember/schema": "2.1.0-rc.6", + "@contember/schema-utils": "2.1.0-rc.6" }, "devDependencies": { "@types/node": "^25.0.3" diff --git a/packages/bindx-react/package.json b/packages/bindx-react/package.json index 809f3ba3..63417999 100644 --- a/packages/bindx-react/package.json +++ b/packages/bindx-react/package.json @@ -17,7 +17,7 @@ "dependencies": { "@contember/bindx": "workspace:*", "@contember/bindx-client": "workspace:*", - "@contember/graphql-client": "^2.1.0-beta.1", + "@contember/graphql-client": "2.1.0-rc.6", "@radix-ui/primitive": "^1.1.3", "@radix-ui/react-slot": "^1.2.4" }, diff --git a/packages/bindx/package.json b/packages/bindx/package.json index 0554b18e..dfc449b2 100644 --- a/packages/bindx/package.json +++ b/packages/bindx/package.json @@ -18,7 +18,7 @@ "license": "MIT", "dependencies": { "@contember/bindx-client": "workspace:*", - "@contember/graphql-client": "^2.1.0-beta.1" + "@contember/graphql-client": "2.1.0-rc.6" }, "repository": { "type": "git", diff --git a/packages/example/api/package.json b/packages/example/api/package.json index cdf93e97..5dbf82ae 100644 --- a/packages/example/api/package.json +++ b/packages/example/api/package.json @@ -4,8 +4,8 @@ "version": "0.0.0", "type": "module", "devDependencies": { - "@contember/schema": "2.1.0-beta.1", - "@contember/schema-definition": "2.1.0-beta.1" + "@contember/schema": "2.1.0-rc.6", + "@contember/schema-definition": "2.1.0-rc.6" }, "dependencies": { "graphql": "^16.8.1" diff --git a/packages/example/package.json b/packages/example/package.json index 8e6a669a..76605e9a 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -17,10 +17,10 @@ "@contember/bindx-repeater": "workspace:*", "@contember/bindx-uploader": "workspace:*", "@contember/bindx-react": "workspace:*", - "@contember/client-content": "^2.1.0-beta.1", - "@contember/graphql-client": "^2.1.0-beta.1", - "@contember/schema": "^2.1.0-beta.1", - "@contember/schema-definition": "^2.1.0-beta.1", + "@contember/client-content": "2.1.0-rc.6", + "@contember/graphql-client": "2.1.0-rc.6", + "@contember/schema": "2.1.0-rc.6", + "@contember/schema-definition": "2.1.0-rc.6", "@tailwindcss/vite": "^4.2.1", "react": "^19.0.0", "react-dom": "^19.0.0",