Fix conflict between dev-master and pull-request branches#17
Merged
schlessera merged 3 commits intomasterfrom Mar 30, 2017
Merged
Fix conflict between dev-master and pull-request branches#17schlessera merged 3 commits intomasterfrom
schlessera merged 3 commits intomasterfrom
Conversation
Some of the builds fail because the circular dependencies "wp-cli -> external-command -> wp-cli" produce an unresolvable conflict.
The main issue is that we had required `"wp-cli/wp-cli": "dev-master"` in the external command packages so that they can always be tested against the latest version.
However, `dev-master` only means "the latest commit on the `master` branch". So, this would then exclude other `wp-cli/wp-cli` branches to be accepted ... like for example pull requests!
Current reasoning is that we just want to make sure that we have "any" WP-CLI to work with, and define the actual version to use for the tests through Travis. So, we think that adding the following combination to each external packages `composer.json` should do the trick:
```"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"wp-cli/wp-cli": "*"
}
```
This specific combination means: "use the *highest* available *stable* version of `wp-cli/wp-cli` while allowing to fall back to `dev-master` if the stable versions don't meet the requirements".
danielbachhuber
approved these changes
Mar 30, 2017
schlessera
added a commit
that referenced
this pull request
Jan 5, 2022
Fix conflict between dev-master and pull-request branches
This file contains hidden or 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
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.
Some of the builds fail because the circular dependencies "wp-cli -> external-command -> wp-cli" produce an unresolvable conflict.
The main issue is that we had required
"wp-cli/wp-cli": "dev-master"in the external command packages so that they can always be tested against the latest version.However,
dev-masteronly means "the latest commit on themasterbranch". So, this would then exclude otherwp-cli/wp-clibranches to be accepted ... like for example pull requests!Current reasoning is that we just want to make sure that we have "any" WP-CLI to work with, and define the actual version to use for the tests through Travis. So, we think that adding the following combination to each external packages
composer.jsonshould do the trick:This specific combination means: "use the highest available stable version of
wp-cli/wp-cliwhile allowing to fall back todev-masterif the stable versions don't meet the requirements".