diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2014-08-29 23:18:45 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-01 10:35:16 +0100 |
| commit | 864dff6aa72615a85e3c7180cfd65cacb66867da (patch) | |
| tree | 8ba3dea5b0ba8143afda9b549a1f0e232cbbddf7 /yarns | |
| parent | 5c90ccfd74d28d817fab50079f0233cd8a555d3a (diff) | |
| download | morph-864dff6aa72615a85e3c7180cfd65cacb66867da.tar.gz | |
Add `morph upgrade` command, deprecate `morph deploy --upgrade`
The arguments to `morph deploy` can get quite long, any way we can make it
shorter and clearer is useful. We can also avoid having the strange
--no-upgrade flag in future.
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/deployment.yarn | 2 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index 4039d551..40b50432 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -7,7 +7,7 @@ Morph Deployment Tests WHEN the user checks out the system branch called master AND the user attempts to deploy the system systems/test-system.morph in branch master THEN morph failed - AND the deploy error message includes the string "morph deploy is only supported for cluster morphologies" + AND the deploy error message includes the string "morph deployment commands are only supported for cluster morphologies" FINALLY the git server is shut down SCENARIO deploying a cluster morphology as a tarfile diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 422c2eea..52eee01d 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -692,7 +692,7 @@ them, so they can be added to the end of the implements section. IMPLEMENTS WHEN the user (attempts to upgrade|upgrades) the (system|cluster) (\S+) in branch (\S+)( with options (.*))? cd "$DATADIR/workspace/$MATCH_4" - set -- deploy --upgrade "$MATCH_3" + set -- upgrade "$MATCH_3" if [ "$MATCH_5" != '' ]; then # eval used so word splitting in the text is preserved eval set -- '"$@"' $MATCH_6 |