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

ci(criu): add CRIU PPA for Podman dependency (backport #770) #771

Merged
merged 3 commits into from
Jan 7, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 7, 2025

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 using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main


See cryostatio/cryostat-core#494

Description of the change:

This change allows an environment variable to be configured so that...

Motivation for the change:

This change is helpful because users may want to...

How to manually test:

  1. Run CRYOSTAT_IMAGE=quay.io... bash smoketest.bash...
  2. ...

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

* ci(criu): add CRIU PPA for Podman dependency

* use ubuntu-latest runner

(cherry picked from commit 19ffc04)

# Conflicts:
#	.github/workflows/pr-ci.yaml
#	.github/workflows/push-ci.yaml
Copy link
Author

mergify bot commented Jan 7, 2025

Cherry-pick of 19ffc04 has failed:

On branch mergify/bp/cryostat-v3.0/pr-770
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 19ffc04.
  (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 <file>..." to mark resolution)
	both modified:   .github/workflows/pr-ci.yaml
	both modified:   .github/workflows/push-ci.yaml

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@andrewazores andrewazores merged commit e5052ed into cryostat-v3.0 Jan 7, 2025
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant