From b3b680f85cd06461bebe99399d90348e9a39793c Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Sun, 12 Oct 2025 16:42:05 +0300 Subject: [PATCH 1/5] Update rust version --- .circleci/config.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa63f07..ed0cd12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build_musl_and_test_ssl: docker: - - image: cimg/rust:1.83-node + - image: cimg/rust:1.90.0 - image: cimg/postgres:17.1 environment: POSTGRES_USER: sql @@ -29,7 +29,7 @@ jobs: run_integration_and_smoke_tests: docker: - - image: cimg/rust:1.83-node + - image: cimg/rust:1.90.0 environment: TEST_DATABASE_URL: postgresql://sql:sql@localhost/sql - image: cimg/postgres:17.1 diff --git a/Dockerfile b/Dockerfile index 0b52f90..100c835 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Builder -FROM rust:1.83 AS builder +FROM rust:1.90 AS builder COPY . /app WORKDIR /app RUN apt update && apt install musl-tools -y From c46fb75dad9d7616d84efef7d0632eaa40d4ac39 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Sun, 12 Oct 2025 16:48:55 +0300 Subject: [PATCH 2/5] use 1.90-node --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed0cd12..6298b93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 jobs: build_musl_and_test_ssl: docker: - - image: cimg/rust:1.90.0 + - image: cimg/rust:1.90-node - image: cimg/postgres:17.1 environment: POSTGRES_USER: sql @@ -29,7 +29,7 @@ jobs: run_integration_and_smoke_tests: docker: - - image: cimg/rust:1.90.0 + - image: cimg/rust:1.90-node environment: TEST_DATABASE_URL: postgresql://sql:sql@localhost/sql - image: cimg/postgres:17.1 From 4cb33c00658f948c554ae19a87a91ac2fbba71d1 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Sun, 12 Oct 2025 16:59:18 +0300 Subject: [PATCH 3/5] Use sudo to install mermaid cli --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6298b93..5d97449 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ jobs: - run: curl --fail -X POST http://localhost:8080/png --data-binary @result.puml -o test.png # Mermaid - - run: npm install -g @mermaid-js/mermaid-cli + - run: sudo npm install -g @mermaid-js/mermaid-cli - run: sudo apt install chromium-bsu libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 - run: ./target/release/sqlant $TEST_DATABASE_URL -o mermaid > input.mmd From 634b69ab6a6f1c15688c892456ab101666f2ad69 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Sun, 12 Oct 2025 17:39:07 +0300 Subject: [PATCH 4/5] try --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d97449..8a1deb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,6 +74,7 @@ jobs: # Mermaid - run: sudo npm install -g @mermaid-js/mermaid-cli + - run: sudo npx puppeteer browsers install chrome-headless-shell - run: sudo apt install chromium-bsu libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 - run: ./target/release/sqlant $TEST_DATABASE_URL -o mermaid > input.mmd From 6ee14bd1614cbc10fe01beb27b32261e83e1c457 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Sun, 12 Oct 2025 19:39:06 +0300 Subject: [PATCH 5/5] Non interactive mode --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a1deb9..8bad829 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,7 @@ jobs: # Mermaid - run: sudo npm install -g @mermaid-js/mermaid-cli - - run: sudo npx puppeteer browsers install chrome-headless-shell + - run: sudo npx --yes puppeteer browsers install chrome-headless-shell - run: sudo apt install chromium-bsu libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libxcomposite1 libxdamage1 - run: ./target/release/sqlant $TEST_DATABASE_URL -o mermaid > input.mmd