Skip to content

Fix conflict between dev-master and pull-request branches#17

Merged
schlessera merged 3 commits intomasterfrom
fix-dev-master-conflict
Mar 30, 2017
Merged

Fix conflict between dev-master and pull-request branches#17
schlessera merged 3 commits intomasterfrom
fix-dev-master-conflict

Conversation

@schlessera
Copy link
Copy Markdown
Member

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:

"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".

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 danielbachhuber self-requested a review March 30, 2017 18:04
@danielbachhuber danielbachhuber added this to the 1.0.3 milestone Mar 30, 2017
@danielbachhuber danielbachhuber added bug command:server Related to 'server' command labels Mar 30, 2017
@schlessera schlessera merged commit 1e9a7c1 into master Mar 30, 2017
@schlessera schlessera deleted the fix-dev-master-conflict branch March 30, 2017 18:25
schlessera added a commit that referenced this pull request Jan 5, 2022
Fix conflict between dev-master and pull-request branches
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug command:server Related to 'server' command

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants