Use direct stdout

prisma · Dec 15, 2023 · 29ff6a2 · 29ff6a2
1 parent 7d25238
commit 29ff6a2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 40 deletions.
diff --git a/.github/workflows/qe-perf.yml b/.github/workflows/qe-perf.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     paths-ignore:
       - ".github/**"
-      - "!.github/workflows/wasm-perf.yml"
+      - "!.github/workflows/qe-perf.yml"
       - ".buildkite/**"
       - "*.md"
       - "LICENSE"
@@ -14,58 +14,50 @@ jobs:
   run-benchmarks:
     name: Run benchmarks
     runs-on: ubuntu-latest
-    outputs:
-      results: ${{ steps.bench.outputs.results }}
     steps:
       - name: Checkout PR branch
         uses: actions/checkout@v4
 
-      - name: "Setup Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node_version }}
+      # - name: "Setup Node.js"
+      #   uses: actions/setup-node@v4
+      #   with:
+      #     node-version: ${{ matrix.node_version }}
 
-      - name: "Setup pnpm"
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
+      # - name: "Setup pnpm"
+      #   uses: pnpm/action-setup@v2
+      #   with:
+      #     version: 8
 
-      - name: "Get pnpm store directory"
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      # - name: "Get pnpm store directory"
+      #   shell: bash
+      #   run: |
+      #     echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - name: "Login to Docker Hub"
-        uses: docker/login-action@v3
-        continue-on-error: true
-        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 }}
+      # - name: "Login to Docker Hub"
+      #   uses: docker/login-action@v3
+      #   continue-on-error: true
+      #   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 }}
 
-      - uses: dtolnay/rust-toolchain@stable
+      # - uses: dtolnay/rust-toolchain@stable
 
-      - name: Install wasm-pack
-        run: cargo install wasm-pack
+      # - name: Install wasm-pack
+      #   run: cargo install wasm-pack
 
-      - name: Setup benchmark
-        run: make setup-pg-bench
+      # - name: Setup benchmark
+      #   run: make setup-pg-bench
 
       - name: Run benchmarks
         id: bench
+        uses: mathiasvr/[email protected]
         run: |
-          echo "results=$(make run-bench)\n" >> $GITHUB_OUTPUT
+          echo "Foo\nBar"
 
-  report:
-    name: Report benchmarks
-    runs-on: ubuntu-latest
-    needs:
-      - run-benchmarks
-
-    steps:
       - name: Find past report comment
         uses: peter-evans/find-comment@v2
         id: findReportComment
@@ -83,6 +75,6 @@ jobs:
             ### Query engine benchmark results
 
             ```sh
-            ${{ needs.run-benchmarks.outputs.results}}
+            ${{ steps.bench.outputs.stdout }}
             ```
           edit-mode: replace
diff --git a/query-engine/driver-adapters/executor/src/bench.ts b/query-engine/driver-adapters/executor/src/bench.ts
@@ -95,7 +95,6 @@ async function benchMarkQueries(
     }
 
     await run({
-      colors: true,
       collect: true,
     });
   } finally {