Fix conflict resolutions stranding the PR when its base branch moved #148
Workflow file for this run
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Tests | |
| on: | |
| pull_request: | |
| jobs: | |
| unit-tests: | |
| name: Unit Tests | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout repository | |
| uses: actions/checkout@v4 | |
| - name: Run unit tests | |
| run: | | |
| bash tests/test_command_utils.sh | |
| bash tests/test_update_pr_stack.sh | |
| bash tests/test_rebase_workflow.sh | |
| bash tests/test_mixed_workflows.sh | |
| bash tests/test_conflict_resolution_resume.sh | |
| bash tests/test_conflict_absorbed_resolution.sh | |
| bash tests/test_merge_commit_merge.sh | |
| bash tests/test_rebase_merge_skip.sh | |
| e2e-tests: | |
| name: E2E Tests | |
| runs-on: ubuntu-latest | |
| # Only run if secrets are available (not available on forks) | |
| if: github.event.pull_request.head.repo.full_name == github.repository | |
| steps: | |
| - name: Checkout repository | |
| uses: actions/checkout@v4 | |
| - name: Generate GitHub App token | |
| id: app-token | |
| uses: actions/create-github-app-token@v2 | |
| with: | |
| app-id: ${{ vars.GH_APP_ID }} | |
| private-key: ${{ secrets.GH_APP_PRIVATE_KEY }} | |
| owner: autorestack-test | |
| # The e2e simulates a human resolving a conflict by running the posted | |
| # comment, which calls `uvx git-merge-onto`. The action itself uses the | |
| # vendored copy via python3 and needs no uv. | |
| - name: Install uv | |
| uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0 | |
| - name: Run e2e tests | |
| env: | |
| GH_TOKEN: ${{ steps.app-token.outputs.token }} | |
| PRESERVE_ON_FAILURE: "1" | |
| run: | | |
| gh auth setup-git | |
| bash tests/test_e2e.sh |