From a7cbe65d41e5755d68bc6b4af752d6b30fb0251b Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 15 May 2024 09:28:10 -0300 Subject: [PATCH] Download base bench to home --- .github/workflows/ci.yml | 10 ++++++++-- yarn-project/scripts/Earthfile | 4 +--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9698b07d570..47fde9f2c4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,12 +141,18 @@ jobs: env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - BENCH_FOLDER: /usr/var/bench + BENCH_FOLDER: "${{ env.HOME }}/base_bench" PULL_REQUEST: "${{ github.event.pull_request.number }}" - name: "Generate summary comment if pull request" if: ${{ github.event_name == 'pull_request' }} working-directory: ./yarn-project/scripts - run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} --secret AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} +bench-comment + run: | + earthly-ci -P \ + --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \ + --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \ + --secret AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} \ + +bench-comment \ + --LOCAL_BASE_BENCH_FOLDER="${{ env.HOME }}/base_bench" noir-format: needs: setup diff --git a/yarn-project/scripts/Earthfile b/yarn-project/scripts/Earthfile index c6b64ab58ed..982e2f933f2 100644 --- a/yarn-project/scripts/Earthfile +++ b/yarn-project/scripts/Earthfile @@ -13,9 +13,7 @@ download-logs: ARG BRANCH FROM +build LET LOG_FOLDER=/usr/var/logs - LET BENCH_FOLDER=/usr/var/bench ENV LOG_FOLDER=$LOG_FOLDER - ENV BENCH_FOLDER=$BENCH_FOLDER ENV COMMIT_HASH=$COMMIT_HASH ENV PULL_REQUEST=$PULL_REQUEST ENV BRANCH=$BRANCH @@ -52,8 +50,8 @@ bench-comment: ARG COMMIT_HASH ARG PULL_REQUEST ARG BRANCH + ARG LOCAL_BASE_BENCH_FOLDER FROM +build - LET LOCAL_BASE_BENCH_FOLDER=/usr/var/bench LET BENCH_FOLDER=/usr/var/bench ENV BENCH_FOLDER=$BENCH_FOLDER ENV COMMIT_HASH=$COMMIT_HASH