diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index ef3650403..42c061843 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -130,9 +130,13 @@ jobs: run: | if [[ -n $(git status --porcelain tests/integration/recordings/) ]]; then echo "New recordings detected, committing and pushing" + + git checkout -B ${{ github.head_ref }} + git add tests/integration/recordings/ - git commit -m "Update recordings" - git push origin HEAD:${{ github.head_ref }} + git commit -m "Update recordings" + git pull --rebase origin ${{ github.head_ref }} + git push origin ${{ github.head_ref }} else echo "No recording changes" fi diff --git a/.github/workflows/integration-vision-tests.yml b/.github/workflows/integration-vision-tests.yml index c3df32fa6..7d6b8e07a 100644 --- a/.github/workflows/integration-vision-tests.yml +++ b/.github/workflows/integration-vision-tests.yml @@ -96,17 +96,19 @@ jobs: git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - - name: Run Integration Tests for All Types (Recording Mode) - uses: ./.github/actions/run-integration-tests - with: - test-types: ${{ needs.discover-tests.outputs.test-types }} - stack-config: 'server:ci-tests' # re-recording must be done in server mode - provider: 'ollama' - inference-mode: 'record' - run-vision-tests: 'true' + # - name: Run Integration Tests for All Types (Recording Mode) + # uses: ./.github/actions/run-integration-tests + # with: + # test-types: ${{ needs.discover-tests.outputs.test-types }} + # stack-config: 'server:ci-tests' # re-recording must be done in server mode + # provider: 'ollama' + # inference-mode: 'record' + # run-vision-tests: 'true' - name: Commit and push recordings run: | + echo "Testing testing" > tests/integration/recordings/test.txt + pwd ls -la tests/integration/recordings/ git status --porcelain tests/integration/recordings/ @@ -114,9 +116,13 @@ jobs: if [[ -n $(git status --porcelain tests/integration/recordings/) ]]; then echo "New recordings detected, committing and pushing" + + git checkout -B ${{ github.head_ref }} + git add tests/integration/recordings/ git commit -m "Update recordings" - git push origin HEAD:${{ github.head_ref }} + git pull --rebase origin ${{ github.head_ref }} + git push origin ${{ github.head_ref }} else echo "No recording changes" fi