Skip to content
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.

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

🍒 Merge changes from PR #1077 to #1080

Closed
wants to merge 1 commit into from

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Aug 5, 2024

Automated PR to merge changes from develop to

I failed to cherry-pick the changes automatically because of the following:

[auto-pr--1077-10617 56d3a4c6] Fix hostname of staging machine
Author: Riku Rouvila <[email protected]>
Date: Thu Aug 1 12:26:11 2024 +0300
1 file changed, 1 insertion(+), 1 deletion(-)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

  git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch auto-pr--1077-10617
You are currently cherry-picking commit a515be16.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To continue manually you can use these commands:

git fetch origin auto-pr--1077-10617:auto-pr--1077-10617
git fetch origin e2e/fix:e2e/fix

git checkout auto-pr--1077-10617
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick a515be1620d8771f322c5c2c86a3678f39039d15~..b9bd06c580b360561dfb2afc13a0675722456dca

Individual commits:

b9bd06c5 Merge branch 'e2e/fix' of github.com:opencrvs/opencrvs-farajaland into e2e/fix
fec92c75 Merge branch 'develop' of github.com:opencrvs/opencrvs-farajaland into e2e/fix
311760f9 fix how previous E2E status is inferred
3c338a7d Merge pull request #1079 from opencrvs/Eezi-patch-1
cf92c548 Rename details-page-validation.spec.ts to 6-details-page-validation.spec.ts
2b25f65f fix: wait for 500ms before continuing
c77d756d fix: after login, pin-input could render before 2s
4656c58f fix: add documnet to upload
51eb6574 fix: upload supporting document in death 4
c8b85290 fix: upload supporting document in death 2
987e1fff fix: upload supporting document in birth 3, 7
8980cb2e configure jump host inventory
3a7a62c4 Revert "Fix hostname of staging machine"
a515be16 fix: wait 500ms before asserting so page will load properly
61c346b3 Fix hostname of staging machine

@github-actions github-actions bot requested a review from jamil314 August 5, 2024 14:54
@jamil314 jamil314 closed this Aug 5, 2024
@rikukissa rikukissa deleted the auto-pr--1077-10617 branch January 10, 2025 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant