Skip to content

ci: fall back if e2e clone branch is gone #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piotr-iohk merged 10 commits into from
Sep 23, 2026
Merged

ci: fall back if e2e clone branch is gone #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ddda379
ci: fall back if e2e clone branch is gone
cursoragent Sep 21, 2026
ad2d4fd
ci: use shared resolve-e2e-ref action
cursoragent Sep 21, 2026
6ed7db4
ci: temporary resolve-e2e-ref smoke workflow
cursoragent Sep 21, 2026
07f3647
ci: smoke trigger via push/PR for resolve-e2e-ref
cursoragent Sep 21, 2026
f210253
ci: smoke cases A/B/C for resolve-e2e-ref
cursoragent Sep 21, 2026
2861716
ci: smoke case C race only
cursoragent Sep 21, 2026
d7a6e9e
ci: smoke case C race retry
cursoragent Sep 21, 2026
d8468dd
ci: remove temporary resolve-e2e-ref smoke
cursoragent Sep 21, 2026
3604e79
ci: pin resolve-e2e-ref to main
cursoragent Sep 21, 2026
9d89d65
ci: soften slack-report e2e resolve so posts still fire
cursoragent Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions .github/workflows/e2e-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,19 @@ jobs:
BACKEND: regtest

steps:
- name: Show selected E2E branch
env:
E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
run: echo $E2E_BRANCH
- name: Resolve E2E tests ref
id: e2e-ref
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

- name: Clone E2E tests
uses: actions/checkout@v7
with:
repository: synonymdev/bitkit-e2e-tests
path: bitkit-e2e-tests
ref: ${{ needs.e2e-branch.outputs.branch }}
ref: ${{ steps.e2e-ref.outputs.ref }}

- name: Download iOS app (regtest)
uses: actions/download-artifact@v8
Expand Down Expand Up @@ -262,11 +264,19 @@ jobs:
needs: [build-staging, e2e-branch, e2e-tests-staging]

steps:
- name: Resolve E2E tests ref
Comment thread
piotr-iohk marked this conversation as resolved.
id: e2e-ref
continue-on-error: true
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

- name: Checkout E2E tests
uses: actions/checkout@v7
with:
repository: synonymdev/bitkit-e2e-tests
ref: ${{ needs.e2e-branch.outputs.branch }}
ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}

- name: Post Slack summary
env:
Expand All @@ -278,5 +288,5 @@ jobs:
E2E_TESTS_RESULT: ${{ needs.e2e-tests-staging.result }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
RUN_ATTEMPT: ${{ github.run_attempt }}
E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
run: python3 scripts/slack_summary.py e2e-staging
12 changes: 7 additions & 5 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,19 @@ jobs:
name: e2e-tests-local - ${{ matrix.shard.name }}

steps:
- name: Show selected E2E branch
env:
E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
run: echo $E2E_BRANCH
- name: Resolve E2E tests ref
id: e2e-ref
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
Comment thread
piotr-iohk marked this conversation as resolved.
Comment thread
piotr-iohk marked this conversation as resolved.
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

- name: Clone E2E tests
uses: actions/checkout@v7
with:
repository: synonymdev/bitkit-e2e-tests
path: bitkit-e2e-tests
ref: ${{ needs.e2e-branch.outputs.branch }}
ref: ${{ steps.e2e-ref.outputs.ref }}

- name: Download iOS app
uses: actions/download-artifact@v8
Expand Down
42 changes: 33 additions & 9 deletions .github/workflows/e2e_migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,24 @@ jobs:
app_branch: ${{ github.head_ref || github.ref_name }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

resolve-e2e-ref:
if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
needs: [e2e-branch]
runs-on: ubuntu-latest
outputs:
ref: ${{ steps.e2e-ref.outputs.ref }}
steps:
- name: Resolve E2E tests ref
id: e2e-ref
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

prepare-wallets:
if: github.event_name != 'pull_request' || (github.event.pull_request.draft == false && (startsWith(github.head_ref, 'release-') || startsWith(github.base_ref, 'release-')))
uses: synonymdev/bitkit-e2e-tests/.github/workflows/migration-wallet-setup.yml@main
needs: [e2e-branch]
needs: [e2e-branch, resolve-e2e-ref]
strategy:
fail-fast: false
matrix:
Expand All @@ -138,7 +152,7 @@ jobs:
- { name: migration_3-with-passphrase, setup_type: passphrase }
- { name: migration_4-with-sweep, setup_type: sweep }
with:
e2e_branch: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch: ${{ needs.resolve-e2e-ref.outputs.ref }}
Comment thread
piotr-iohk marked this conversation as resolved.
rn_version: ${{ matrix.rn_version }}
setup_type: ${{ matrix.scenario.setup_type }}
scenario_name: ${{ matrix.scenario.name }}
Expand All @@ -165,17 +179,19 @@ jobs:
BACKEND: regtest

steps:
- name: Show selected E2E branch
env:
E2E_BRANCH: ${{ needs.e2e-branch.outputs.branch }}
run: echo $E2E_BRANCH
- name: Resolve E2E tests ref
id: e2e-ref
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

- name: Clone E2E tests
uses: actions/checkout@v7
with:
repository: synonymdev/bitkit-e2e-tests
path: bitkit-e2e-tests
ref: ${{ needs.e2e-branch.outputs.branch }}
ref: ${{ steps.e2e-ref.outputs.ref }}

- name: Download iOS app
uses: actions/download-artifact@v8
Expand Down Expand Up @@ -336,11 +352,19 @@ jobs:
runs-on: ubuntu-latest
needs: [build, e2e-branch, prepare-wallets, e2e-tests]
steps:
- name: Resolve E2E tests ref
Comment thread
piotr-iohk marked this conversation as resolved.
id: e2e-ref
continue-on-error: true
uses: synonymdev/bitkit-e2e-tests/.github/actions/resolve-e2e-ref@main
with:
selected: ${{ needs.e2e-branch.outputs.branch }}
e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}

- name: Checkout E2E tests
uses: actions/checkout@v7
with:
repository: synonymdev/bitkit-e2e-tests
ref: ${{ needs.e2e-branch.outputs.branch }}
ref: ${{ steps.e2e-ref.outputs.ref || 'main' }}

- name: Post Slack summary
env:
Expand All @@ -353,5 +377,5 @@ jobs:
E2E_TESTS_RESULT: ${{ needs.e2e-tests.result }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
RUN_ATTEMPT: ${{ github.run_attempt }}
E2E_TESTS_REF: ${{ needs.e2e-branch.outputs.branch }}
E2E_TESTS_REF: ${{ steps.e2e-ref.outputs.ref }}
run: python3 scripts/slack_summary.py e2e-migration
Loading