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

test(scorecard): fix rebasing skipped commit (backport #780) #782

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

test(scorecard): use methods for more easily passing data

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #749

Accidentally got rid of Elliott's PR when rebasing in #779


This is an automatic backport of pull request #780 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Mar 27, 2024
Copy link
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of b397095 has failed:

On branch mergify/bp/cryostat3/pr-780
Your branch is up to date with 'origin/cryostat3'.

You are currently cherry-picking commit b397095.
  (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)

Changes to be committed:
	modified:   internal/images/custom-scorecard-tests/main.go
	modified:   internal/test/scorecard/common_utils.go
	modified:   internal/test/scorecard/logger.go
	modified:   internal/test/scorecard/openshift.go
	modified:   internal/test/scorecard/tests.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml
	both modified:   bundle/tests/scorecard/config.yaml
	both modified:   config/scorecard/patches/custom.config.yaml

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

* Merge pull request #8 from ebaron/scorecard-methods

test(scorecard): use methods for more easily passing data

* update bundle image

(cherry picked from commit b397095)
@ebaron ebaron force-pushed the mergify/bp/cryostat3/pr-780 branch from abbfb79 to 98280b5 Compare March 27, 2024 18:32
@ebaron
Copy link
Member

ebaron commented Mar 27, 2024

/build_test

Copy link

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron added test and removed conflicts labels Mar 27, 2024
@ebaron ebaron merged commit 0b380d2 into cryostat3 Mar 27, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat3/pr-780 branch March 27, 2024 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants