diff --git a/.github/workflows/ci-3p-aiomysql.yml b/.github/workflows/ci-3p-aiomysql.yml index a1abe531f..418cf0b82 100644 --- a/.github/workflows/ci-3p-aiomysql.yml +++ b/.github/workflows/ci-3p-aiomysql.yml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'proxysql/proxysql_3p_testing' - ref: ${{ env.TESTTREE }} + ref: main fetch-depth: 1 path: 'proxysql_3p_testing' token: ${{ secrets.GH_TOKEN_PROXYSQL }} @@ -98,6 +98,7 @@ jobs: cd proxysql_3p_testing/ ./setup.sh test_${{ env.TESTNAME }}/${{ env.TESTNAME }} git switch ${{ env.TESTTREE }} + git pull git config user.email "GH-Actions@proxysql.com" git config user.name "GH-Actions" git rebase main -f -s recursive -X theirs