From cfe897bd28f4031440612efa21ac979848f5050f Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 15 Dec 2023 14:10:28 +0100 Subject: [PATCH] Use direct stdout --- .github/workflows/qe-perf.yml | 68 ++++++++----------- .../driver-adapters/executor/src/bench.ts | 1 - 2 files changed, 30 insertions(+), 39 deletions(-) diff --git a/.github/workflows/qe-perf.yml b/.github/workflows/qe-perf.yml index 947e25d1a95d..3851c035ef6e 100644 --- a/.github/workflows/qe-perf.yml +++ b/.github/workflows/qe-perf.yml @@ -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/command-output@v2.0.0 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 index 706448001381..301a332d151e 100644 --- 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 {