[2.7] Resolve conflicts in .github/workflows/test.yaml
#11253
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove two unused / maintained docker files and associated references
[2.8] Port drone build tasks to gh workflows + actions
[2.7] Port drone build tasks to gh workflows + actions
[2.8] Backport changes for gh action updates
[2.7] Backport changes for gh action updates
|
Closing the PR. Opting for a different approach in order to protect content under |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This merges
release-2.7intorelease-2.7.patch1in an effort to resolve merge conflicts found in.github/workflows/test.yaml1 while attempting to merge in the other direction.Checklist
Footnotes
https://github.com/rancher/dashboard/pull/11251 ↩