From aeee9ad44a4ebe597fc97dc08817b1e933b73f94 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 5 May 2025 20:15:06 +0200 Subject: [PATCH] small fixes --- .github/workflows/test_admin_interface.yml | 2 +- .github/workflows/test_backend.yml | 8 +++++--- .github/workflows/test_database.yml | 2 +- .github/workflows/test_dht_node.yml | 2 +- .github/workflows/test_federation.yml | 2 +- .github/workflows/test_frontend.yml | 2 +- backend/src/password/EncryptorUtils.ts | 4 ++-- frontend/turbo.json | 1 - 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_admin_interface.yml b/.github/workflows/test_admin_interface.yml index b9d62a5ad..2026b487a 100644 --- a/.github/workflows/test_admin_interface.yml +++ b/.github/workflows/test_admin_interface.yml @@ -58,7 +58,7 @@ jobs: - name: install dependencies run: | bun install --filter admin --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Admin Interface | Unit tests id: test diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index f177668f8..7c4d25026 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -56,13 +56,15 @@ jobs: uses: oven-sh/setup-bun@v2 - name: install dependencies - run: bun install --filter backend --frozen-lockfile + run: | + bun install --filter backend --frozen-lockfile + bun install --global --no-save turbo@^2 - name: Wait for MariaDB to be ready run: until nc -z localhost 3306; do echo waiting for db; sleep 1; done; - name: Backend | Unit tests - run: bun turbo backend#test + run: turbo backend#test typecheck: if: needs.files-changed.outputs.backend == 'true' @@ -84,7 +86,7 @@ jobs: - name: install dependencies run: | bun install --filter backend --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Backend | Typecheck run: turbo backend#typecheck backend#build diff --git a/.github/workflows/test_database.yml b/.github/workflows/test_database.yml index 5a448e434..9347ba30a 100644 --- a/.github/workflows/test_database.yml +++ b/.github/workflows/test_database.yml @@ -51,7 +51,7 @@ jobs: - name: install dependencies run: | bun install --filter database --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Wait for MariaDB to be ready run: docker run --rm --network gradido_internal-net busybox sh -c 'until nc -z mariadb 3306; do echo waiting for db; sleep 1; done;' diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 4e2daf2d2..f454c9cff 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -57,7 +57,7 @@ jobs: - name: install dependencies run: | bun install --filter dht-node --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Wait for MariaDB to be ready run: until nc -z localhost 3306; do echo waiting for db; sleep 1; done; diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index d139b9d27..7dfd36c81 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -57,7 +57,7 @@ jobs: - name: install dependencies run: | bun install --filter federation --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Wait for MariaDB to be ready run: until nc -z localhost 3306; do echo waiting for db; sleep 1; done; diff --git a/.github/workflows/test_frontend.yml b/.github/workflows/test_frontend.yml index 2f8931c5d..9691e4694 100644 --- a/.github/workflows/test_frontend.yml +++ b/.github/workflows/test_frontend.yml @@ -81,7 +81,7 @@ jobs: - name: install dependencies run: | bun install --filter frontend --frozen-lockfile - bun install --global turbo@^2 + bun install --global --no-save turbo@^2 - name: Frontend | Lint id: lint diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts index 53e217078..afb706cfb 100644 --- a/backend/src/password/EncryptorUtils.ts +++ b/backend/src/password/EncryptorUtils.ts @@ -22,7 +22,8 @@ let encryptionWorkerPool: Pool | undefined if (CONFIG.USE_CRYPTO_WORKER === true) { encryptionWorkerPool = pool( path.join(__dirname, '..', 'build', 'password', 'EncryptionWorker.js'), - { maxQueueSize: 30 * cpus().length }) + { maxQueueSize: 30 * cpus().length }, + ) } // We will reuse this for changePassword @@ -69,7 +70,6 @@ export const SecretKeyCryptographyCreateKey = async ( // pool is throwing this error // throw new Error('Max queue size of ' + this.maxQueueSize + ' reached'); // will be shown in frontend to user - console.log(JSON.stringify(e, null, 2)) throw new LogError('Server is full, please try again in 10 minutes.', e) } } diff --git a/frontend/turbo.json b/frontend/turbo.json index 771b65a25..434acaba2 100644 --- a/frontend/turbo.json +++ b/frontend/turbo.json @@ -18,4 +18,3 @@ } } } - \ No newline at end of file