From 94bdcbabfc946374c6e848b38c1129f23e4d5da3 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Fri, 8 Sep 2023 23:07:17 +0200 Subject: [PATCH] Fix Auto-GPT CI cassette submodule --- .github/workflows/autogpt-ci.yml | 14 +++++++------- .github/workflows/autogpt-docker-ci.yml | 4 ++-- .github/workflows/benchmarks.yml | 4 ++-- .github/workflows/pr-label.yml | 2 +- .gitmodules | 3 +++ autogpts/autogpt/.gitattributes | 2 +- autogpts/autogpt/.gitmodules | 4 ---- autogpts/autogpt/tests/vcr/__init__.py | 2 +- autogpts/autogpt/tests/vcr_cassettes | 1 + 9 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 .gitmodules delete mode 100644 autogpts/autogpt/.gitmodules create mode 160000 autogpts/autogpt/tests/vcr_cassettes diff --git a/.github/workflows/autogpt-ci.yml b/.github/workflows/autogpt-ci.yml index 029be68f91c8..a238d0bce814 100644 --- a/.github/workflows/autogpt-ci.yml +++ b/.github/workflows/autogpt-ci.yml @@ -5,19 +5,19 @@ on: branches: [ master, ci-test* ] paths: - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - '!autogpts/autogpt/tests/vcr_cassettes' - '!autogpts/autogpt/tests/challenges/current_score.json' pull_request: branches: [ stable, master, release-* ] paths: - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - '!autogpts/autogpt/tests/vcr_cassettes' - '!autogpts/autogpt/tests/challenges/current_score.json' pull_request_target: branches: [ master, release-*, ci-test* ] paths: - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - '!autogpts/autogpt/tests/vcr_cassettes' - '!autogpts/autogpt/tests/challenges/current_score.json' concurrency: @@ -122,7 +122,7 @@ jobs: run: | cassette_branch="${{ github.event.pull_request.user.login }}-${{ github.event.pull_request.head.ref }}" cassette_base_branch="${{ github.event.pull_request.base.ref }}" - cd tests/Auto-GPT-test-cassettes + cd tests/vcr_cassettes if ! git ls-remote --exit-code --heads origin $cassette_base_branch ; then cassette_base_branch="master" @@ -192,7 +192,7 @@ jobs: git config "$config_key" \ "Authorization: Basic $base64_pat" - cd tests/Auto-GPT-test-cassettes + cd tests/vcr_cassettes git config "$config_key" \ "Authorization: Basic $base64_pat" @@ -223,7 +223,7 @@ jobs: cassette_branch="${{ github.ref_name }}" fi - cd tests/Auto-GPT-test-cassettes + cd tests/vcr_cassettes # Commit & push changes to cassettes if any if ! git diff --quiet; then git add . @@ -231,7 +231,7 @@ jobs: git push origin HEAD:$cassette_branch if [ ! $is_pull_request ]; then cd ../.. - git add tests/Auto-GPT-test-cassettes + git add tests/vcr_cassettes git commit -m "Update cassette submodule" git push origin HEAD:$cassette_branch fi diff --git a/.github/workflows/autogpt-docker-ci.yml b/.github/workflows/autogpt-docker-ci.yml index 92f0557254df..eae432145bd4 100644 --- a/.github/workflows/autogpt-docker-ci.yml +++ b/.github/workflows/autogpt-docker-ci.yml @@ -5,13 +5,13 @@ on: branches: [ master ] paths: - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - '!autogpts/autogpt/tests/vcr_cassettes' - '!autogpts/autogpt/tests/challenges/current_score.json' pull_request: branches: [ master, release-*, stable ] paths: - 'autogpts/autogpt/**' - - '!autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - '!autogpts/autogpt/tests/vcr_cassettes' - '!autogpts/autogpt/tests/challenges/current_score.json' concurrency: diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index a7d73c4413b7..dc594ec7b6ab 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -49,7 +49,7 @@ jobs: - name: Run pytest with coverage run: | - rm -rf tests/Auto-GPT-test-cassettes + rm -rf tests/vcr_cassettes pytest -n auto --record-mode=all ${{ matrix.config.task }} env: CI: true @@ -70,4 +70,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: cassettes-${{ matrix.config.task-name }} - path: tests/Auto-GPT-test-cassettes/ + path: tests/vcr_cassettes/ diff --git a/.github/workflows/pr-label.yml b/.github/workflows/pr-label.yml index 3b70489de574..fb50e7c14bfc 100644 --- a/.github/workflows/pr-label.yml +++ b/.github/workflows/pr-label.yml @@ -5,7 +5,7 @@ on: push: branches: [ master, release-* ] paths-ignore: - - 'autogpts/autogpt/tests/Auto-GPT-test-cassettes' + - 'autogpts/autogpt/tests/vcr_cassettes' - 'autogpts/autogpt/tests/challenges/current_score.json' - 'benchmark/reports/**' # So that the `dirtyLabel` is removed if conflicts are resolve diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..c7d5712200ea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "autogpts/autogpt/tests/vcr_cassettes"] + path = autogpts/autogpt/tests/vcr_cassettes + url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes diff --git a/autogpts/autogpt/.gitattributes b/autogpts/autogpt/.gitattributes index 88a33bf75421..60fb560da4aa 100644 --- a/autogpts/autogpt/.gitattributes +++ b/autogpts/autogpt/.gitattributes @@ -1,5 +1,5 @@ # Exclude VCR cassettes from stats -tests/Auto-GPT-test-cassettes/**/**.y*ml linguist-generated +tests/vcr_cassettes/**/**.y*ml linguist-generated # Mark documentation as such docs/**.md linguist-documentation diff --git a/autogpts/autogpt/.gitmodules b/autogpts/autogpt/.gitmodules deleted file mode 100644 index 55d09f842c8f..000000000000 --- a/autogpts/autogpt/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "tests/Auto-GPT-test-cassettes"] - path = tests/Auto-GPT-test-cassettes - url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes - branch = master \ No newline at end of file diff --git a/autogpts/autogpt/tests/vcr/__init__.py b/autogpts/autogpt/tests/vcr/__init__.py index 539834fc5eaf..8272001c11c7 100644 --- a/autogpts/autogpt/tests/vcr/__init__.py +++ b/autogpts/autogpt/tests/vcr/__init__.py @@ -47,7 +47,7 @@ def get_base_vcr_config(request): @pytest.fixture() def vcr_cassette_dir(request): test_name = os.path.splitext(request.node.name)[0] - return os.path.join("tests/Auto-GPT-test-cassettes", test_name) + return os.path.join("tests/vcr_cassettes", test_name) def patch_api_base(requestor: openai.api_requestor.APIRequestor): diff --git a/autogpts/autogpt/tests/vcr_cassettes b/autogpts/autogpt/tests/vcr_cassettes new file mode 160000 index 000000000000..f839a09aa6ae --- /dev/null +++ b/autogpts/autogpt/tests/vcr_cassettes @@ -0,0 +1 @@ +Subproject commit f839a09aa6ae80aaf630eecd3782e0afe698a5cd