From 784e2bbb1c153935c33f30b15e39329a10b5c5b1 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Sat, 17 Feb 2024 18:09:44 +0100 Subject: [PATCH] fix(ci/benchmark): Mitigate VCS conflicts with files in data branch `agbenchmark` currently creates files like success_rate.json in the base REPORTS_FOLDER, which causes conflicts in the last step of the benchmark workflow. To prevent issues, these files must be removed prior to switching to the data branch. --- .github/workflows/autogpts-benchmark.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/autogpts-benchmark.yml b/.github/workflows/autogpts-benchmark.yml index 10efbc53..9403f438 100644 --- a/.github/workflows/autogpts-benchmark.yml +++ b/.github/workflows/autogpts-benchmark.yml @@ -68,6 +68,9 @@ jobs: - name: Push reports to data branch run: | + # BODGE: Remove success_rate.json and regression_tests.json to avoid conflicts on checkout + rm ${{ env.REPORTS_FOLDER }}/*.json + git config --global user.name 'GitHub Actions' git config --global user.email 'github-actions@agpt.co' git fetch origin ${{ env.REPORTS_BRANCH }}:${{ env.REPORTS_BRANCH }} \