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

feat(mirage): implement additional mock route handlers (backport #1092) #1100

Merged
merged 2 commits into from
Aug 31, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 31, 2023

This is an automatic backport of pull request #1092 done by Mergify.
Cherry-pick of c185969 has failed:

On branch mergify/bp/cryostat-v2.3/pr-1092
Your branch is up to date with 'origin/cryostat-v2.3'.

You are currently cherry-picking commit c185969.
  (fix conflicts and 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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/mirage/factories.ts
	deleted by us:   src/mirage/index.ts

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Aug 31, 2023
@mergify mergify bot assigned tthvo Aug 31, 2023
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@tthvo tthvo added feat New feature or request safe-to-test labels Aug 31, 2023
@github-actions
Copy link

Test image available:

CRYOSTAT_IMAGE=ghcr.io/cryostatio/cryostat-web:pr-1100-306ceb1e32aa580b6f9f4c3cbc66cd2b97b8ded4 sh smoketest.sh

@andrewazores
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Author

mergify bot commented Aug 31, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging src/mirage/factories.ts
CONFLICT (add/add): Merge conflict in src/mirage/factories.ts
Auto-merging src/mirage/index.ts
CONFLICT (add/add): Merge conflict in src/mirage/index.ts
error: could not apply 306ceb1... feat(mirage): implement additional mock route handlers (#1092)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 306ceb1... feat(mirage): implement additional mock route handlers (#1092)

err-code: 14405

@andrewazores andrewazores force-pushed the mergify/bp/cryostat-v2.3/pr-1092 branch from 306ceb1 to e969116 Compare August 31, 2023 13:40
@github-actions
Copy link

Test image available:

CRYOSTAT_IMAGE=ghcr.io/cryostatio/cryostat-web:pr-1100-f1f82fb9eae17dcb921e8eed766f38d64ac70a3b sh smoketest.sh

@andrewazores andrewazores merged commit e6c4aaa into cryostat-v2.3 Aug 31, 2023
@mergify mergify bot deleted the mergify/bp/cryostat-v2.3/pr-1092 branch August 31, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts feat New feature or request safe-to-test
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants