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

Cleaned up Docker pipelines (backport #121) #123

Merged
merged 3 commits into from
Oct 12, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 12, 2023

This is an automatic backport of pull request #121 done by Mergify.
Cherry-pick of 11807c8 has failed:

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

You are currently cherry-picking commit 11807c8.
  (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:
	new file:   .devcontainer/nouveau/Dockerfile
	new file:   .devcontainer/nvidia/Dockerfile
	modified:   .docker/Dockerfile
	new file:   .docker/compose/nouveau-desktop.yaml
	new file:   .docker/compose/nvidia-desktop.yaml
	deleted:    .docker/entrypoints/dev.sh
	modified:   .docker/entrypoints/sim.sh
	modified:   .dockerignore
	modified:   .github/workflows/docker.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .devcontainer/nouveau/devcontainer.json
	both modified:   .devcontainer/nvidia/devcontainer.json
	both modified:   .github/ISSUE_TEMPLATE/config.yaml
	both modified:   .github/workflows/ci.yaml

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

Fixes #25

* Cleaned up Dockerfile and added new user entrypoints

* Fixed robot pipeline to support building for arm64

* Updated devcontainer configurations to use latest changes

* Testing pipelines

* Removed testing branch from pipelines

* Precommit

* Resolved pr comments

(cherry picked from commit 11807c8)

# Conflicts:
#	.devcontainer/nouveau/devcontainer.json
#	.devcontainer/nvidia/devcontainer.json
#	.github/ISSUE_TEMPLATE/config.yaml
#	.github/workflows/ci.yaml
@mergify mergify bot added the conflicts label Oct 12, 2023
@mergify mergify bot mentioned this pull request Oct 12, 2023
6 tasks
@evan-palmer evan-palmer self-requested a review October 12, 2023 23:09
@evan-palmer evan-palmer self-assigned this Oct 12, 2023
@evan-palmer evan-palmer merged commit fde91c4 into humble Oct 12, 2023
7 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/humble/pr-121 branch October 12, 2023 23:55
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