This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
Fix Incorrectly Resolved and Untested Merge Conflicts in Pipeline Configuration File #7489
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
|
How come LRT is using 1.8.0? |
|
I just reverted it back to the most recent working state. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Change Description
I removed the
auto-buildkite-pipelines:protocol-features-sync-nodesbranch in pull request 7467 but then, in commit 2bcddd7fca4162f49db350ece8e27b49cd8e5080, someone incorrectly resolved merge conflicts and pointed theeosio-lrtandeosio-build-unpinnedpipelines at this deleted branch without testing their changes.I have restored these pipelines to their state in pull request 7467.
Tested
eosio-build-unpinnedbuild 241eosio-lrtbuild 549Consensus Changes
None.
API Changes
None.
Documentation Additions
None.