From a08b7a3064c50a0d779d2d81361a4a8dd20b30d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Colladon?= Date: Thu, 25 Jan 2024 17:24:53 +0100 Subject: [PATCH] fix: perf test execution --- .github/actions/install/action.yml | 2 +- .github/workflows/on-main-push.yml | 11 ++++++----- .github/workflows/on-pull-request.yml | 4 ++-- .github/workflows/reusable-build.yml | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index b3bf9bc6..1595855f 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -10,7 +10,7 @@ runs: run: echo "yarn-cache=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT" shell: bash - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ${{ steps.yarn-cache-dir-path.outputs.yarn-cache }} key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/on-main-push.yml b/.github/workflows/on-main-push.yml index b12536f2..ff2ac086 100644 --- a/.github/workflows/on-main-push.yml +++ b/.github/workflows/on-main-push.yml @@ -102,7 +102,7 @@ jobs: run: echo "yarn-cache=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT" shell: bash - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ${{ steps.yarn-cache-dir-path.outputs.yarn-cache }} key: ${{ runner.os }}-16-yarn-${{ hashFiles('**/yarn.lock') }} @@ -120,7 +120,7 @@ jobs: run: | yarn set version classic sfdx plugins:link . - sfdx plugins + sfdx plugins - name: Checkout e2e test subject uses: actions/checkout@v4 @@ -130,9 +130,10 @@ jobs: path: ./e2e - name: Run benchmark - run: | - git checkout -f main - yarn test:perf + run: yarn test:perf + + - name: Restore state + run: git restore . - name: Store benchmark result uses: benchmark-action/github-action-benchmark@v1 diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index ba3e0812..83ccadc8 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -88,7 +88,7 @@ jobs: VALIDATE_ALL_CODEBASE: true # ADD CUSTOM ENV VARIABLES HERE TO OVERRIDE VALUES OF .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: megalinter-reports @@ -123,7 +123,7 @@ jobs: run: echo "yarn-cache=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT" shell: bash - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ${{ steps.yarn-cache-dir-path.outputs.yarn-cache }} key: ${{ runner.os }}-${{ matrix.node }}-yarn-${{ hashFiles('**/yarn.lock') }} diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 48d5c9eb..c254285a 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -41,7 +41,7 @@ jobs: - name: Functional test run: yarn test:nut - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: coverage-test-report path: reports/coverage