From 87000b9863599bcab1769a68b466108a0e68216b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Galeran?= Date: Fri, 27 Oct 2023 10:45:45 +0200 Subject: [PATCH 1/5] ci: fix publish-prisma-schema-wasm.yml (#4388) --- .github/workflows/publish-prisma-schema-wasm.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-prisma-schema-wasm.yml b/.github/workflows/publish-prisma-schema-wasm.yml index 070bf528654a..e47031837224 100644 --- a/.github/workflows/publish-prisma-schema-wasm.yml +++ b/.github/workflows/publish-prisma-schema-wasm.yml @@ -37,15 +37,16 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '20.x' - registry-url: 'https://registry.npmjs.org/' + + # This is needed to be done manually because of `PACKAGE_DIR` used later + - name: Set up NPM token for publishing later + run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc - name: Update version in package.json & Publish @prisma/prisma-schema-wasm run: # Update version in package.json and return directory for later usage PACKAGE_DIR=$( nix run .#renderPrismaSchemaWasmPackage ${{ github.event.inputs.enginesWrapperVersion }}) npm publish "$PACKAGE_DIR" --access public --tag ${{ github.event.inputs.npmDistTag }} - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # # Failure handlers From f2a389ec6343da9935493c8170851414a559371e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Galeran?= Date: Fri, 27 Oct 2023 10:56:42 +0200 Subject: [PATCH 2/5] ci: fix publish-prisma-schema-wasm.yml (#4389) --- .github/workflows/publish-prisma-schema-wasm.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-prisma-schema-wasm.yml b/.github/workflows/publish-prisma-schema-wasm.yml index e47031837224..78d139f80772 100644 --- a/.github/workflows/publish-prisma-schema-wasm.yml +++ b/.github/workflows/publish-prisma-schema-wasm.yml @@ -47,7 +47,9 @@ jobs: # Update version in package.json and return directory for later usage PACKAGE_DIR=$( nix run .#renderPrismaSchemaWasmPackage ${{ github.event.inputs.enginesWrapperVersion }}) npm publish "$PACKAGE_DIR" --access public --tag ${{ github.event.inputs.npmDistTag }} - + env: + # Required for publishing + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # # Failure handlers # From 0bd2db9e01fa7842e8d4b6e3bc4599351bd562e0 Mon Sep 17 00:00:00 2001 From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:59:27 +0200 Subject: [PATCH 3/5] fix: typo in metric description (#4387) --- query-engine/black-box-tests/tests/metrics/smoke_tests.rs | 2 +- query-engine/metrics/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs index 8542f753b78e..3397de75af99 100644 --- a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs +++ b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs @@ -76,7 +76,7 @@ mod smoke_tests { assert_eq!(metrics.matches("# HELP prisma_client_queries_active The number of currently active Prisma Client queries").count(), 1); assert_eq!(metrics.matches("# TYPE prisma_client_queries_active gauge").count(), 1); - assert_eq!(metrics.matches("# HELP prisma_client_queries_wait The number of datasource queries currently waiting for an free connection").count(), 1); + assert_eq!(metrics.matches("# HELP prisma_client_queries_wait The number of datasource queries currently waiting for a free connection").count(), 1); assert_eq!(metrics.matches("# TYPE prisma_client_queries_wait gauge").count(), 1); assert_eq!(metrics.matches("# HELP prisma_pool_connections_busy The number of pool connections currently executing datasource queries").count(), 1); diff --git a/query-engine/metrics/src/lib.rs b/query-engine/metrics/src/lib.rs index 7f34f84a8612..1965b56cb076 100644 --- a/query-engine/metrics/src/lib.rs +++ b/query-engine/metrics/src/lib.rs @@ -89,7 +89,7 @@ static METRIC_RENAMES: Lazy> (MOBC_POOL_CONNECTIONS_OPEN, ("prisma_pool_connections_open", "The number of pool connections currently open")), (MOBC_POOL_CONNECTIONS_BUSY, ("prisma_pool_connections_busy", "The number of pool connections currently executing datasource queries")), (MOBC_POOL_CONNECTIONS_IDLE, ("prisma_pool_connections_idle", "The number of pool connections that are not busy running a query")), - (MOBC_POOL_WAIT_COUNT, ("prisma_client_queries_wait", "The number of datasource queries currently waiting for an free connection")), + (MOBC_POOL_WAIT_COUNT, ("prisma_client_queries_wait", "The number of datasource queries currently waiting for a free connection")), (MOBC_POOL_WAIT_DURATION, ("prisma_client_queries_wait_histogram_ms", "The distribution of the time all datasource queries spent waiting for a free connection")), ]) }); From 4362521bfeb4ec2631819c6c1421af0221640137 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:23:06 +0200 Subject: [PATCH 4/5] chore(deps): update mysql docker tag to v5.7.44 (#2735) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index fc585adabafe..c0d4f179e0a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -182,7 +182,7 @@ services: tmpfs: /var/lib/mysql mysql-5-7: - image: mysql:5.7.32 + image: mysql:5.7.44 command: mysqld restart: unless-stopped platform: linux/x86_64 From 3305eccac7176c86ac9678ad7e6da63c5b0d20c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Galeran?= Date: Fri, 27 Oct 2023 11:38:05 +0200 Subject: [PATCH 5/5] ci: fix yml files for GitHub Actions workflow for DOCKERHUB login (#4390) --- .github/workflows/query-engine-black-box.yml | 5 ++++- .github/workflows/query-engine-driver-adapters.yml | 5 ++++- .github/workflows/query-engine.yml | 5 ++++- .github/workflows/schema-engine.yml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/query-engine-black-box.yml b/.github/workflows/query-engine-black-box.yml index a941588dfd8e..5ebcd79cec4c 100644 --- a/.github/workflows/query-engine-black-box.yml +++ b/.github/workflows/query-engine-black-box.yml @@ -50,7 +50,10 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 continue-on-error: true - if: "${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + if: "${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}" with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/query-engine-driver-adapters.yml b/.github/workflows/query-engine-driver-adapters.yml index 5b34b9761c4c..7823bed70cfb 100644 --- a/.github/workflows/query-engine-driver-adapters.yml +++ b/.github/workflows/query-engine-driver-adapters.yml @@ -68,7 +68,10 @@ jobs: - name: 'Login to Docker Hub' uses: docker/login-action@v3 continue-on-error: true - if: "${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + if: "${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}" with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/query-engine.yml b/.github/workflows/query-engine.yml index 3df596e20d61..762c3da4a50a 100644 --- a/.github/workflows/query-engine.yml +++ b/.github/workflows/query-engine.yml @@ -80,7 +80,10 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 continue-on-error: true - if: "${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + if: "${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}" with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/schema-engine.yml b/.github/workflows/schema-engine.yml index c6249f069091..03d23317bbd0 100644 --- a/.github/workflows/schema-engine.yml +++ b/.github/workflows/schema-engine.yml @@ -113,7 +113,10 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 continue-on-error: true - if: "${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}" + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + if: "${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}" with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }}