From 8880920c9797a46bff75673e27f7811d88bfcb97 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 9 Apr 2024 15:22:02 +0100 Subject: [PATCH 1/2] Remove the test container logs. --- .github/workflows/budibase_ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 42d73ba8bb..0bbed77458 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -92,7 +92,6 @@ jobs: test-libraries: runs-on: ubuntu-latest env: - DEBUG: testcontainers,testcontainers:exec,testcontainers:build,testcontainers:pull REUSE_CONTAINERS: true steps: - name: Checkout repo @@ -151,7 +150,6 @@ jobs: test-server: runs-on: budi-tubby-tornado-quad-core-150gb env: - DEBUG: testcontainers,testcontainers:exec,testcontainers:build,testcontainers:pull REUSE_CONTAINERS: true steps: - name: Checkout repo From 16bf48586daaeabd536dbc5c8ad67864b96a722d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 9 Apr 2024 15:22:31 +0100 Subject: [PATCH 2/2] Run top level 'test' sequentially, rather than in parallel, which can cause problems, also use REUSE_CONTAINERS by default. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d99304423a..2816247939 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "dev:all": "yarn run kill-all && lerna run --stream dev", "dev:built": "yarn run kill-all && cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream dev:built", "dev:docker": "yarn build --scope @budibase/server --scope @budibase/worker && docker-compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0", - "test": "lerna run --stream test --stream", + "test": "REUSE_CONTAINERS=1 lerna run --concurrency 1 --stream test --stream", "lint:eslint": "eslint packages --max-warnings=0", "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\"", "lint": "yarn run lint:eslint && yarn run lint:prettier",