updated #116 pipeline changes

Author: groenborg

ci/notes/CHANGELOG.md

@@ -1,10 +1,18 @@
-We have enhanced the phlow so it's better to use, when building pipelines supporting pretested integration.
-Some issues for private repos should also be fixed.
+This new version contains a **Major** semantic change in the **wrapup** command. It has been returned to the default behaviour, so wrapup no longer requires `--hard` to add you changes, it does that automatically. I apologize for the inconvenience and confusion these changes to `wrapup` have introduced.
+The output and error handling is under improvement to make the tool more userfriendly to use. 
 
 
-#### Features
+
+#### Improvements
 - upnext now has a prefix option #79 @groenborg
+- deliver now always change back to your default branch #75 @groenborg 
+- made workon less verbose #115 @groenborg
+- return wrapup to old behaviour #89 @groenborg
+- wrapup now has a `--force` flag for a custom commit message #90 @groenborg
+
+#### Bug fixes
+- private repo access for web api should be fixed #81 #83 #84@groenborg 
+- fixed typo in workon #95 @randomsort
+- removed squash message #85 @groenborg
+
 
-#### bug fixes
-- deliver now always change back to your default branch #75 @groenborg
-- private repo access for web api should be fixed #81 #83 # 84@groenborg 

ci/pipeline.yml

@@ -96,8 +96,12 @@ jobs:
 - name: integration-test
   plan:
   - get: git-phlow
+  - get: gp-version
+    params: {bump: patch}
   - get: tollgate
     trigger: true
+  - put: gp-version
+    params: {file: gp-version/version}
   - task: integration
     file: tollgate/ci/tasks/run-tests.yml
     on_failure:
@@ -116,11 +120,9 @@ jobs:
 - name: build-phlow-artifacts
   plan:
     - get: gp-version
-      params: {bump: patch}
     - get: git-phlow 
       passed: [integration-test]
-    - put: gp-version
-      params: {file: gp-version/version}
+      trigger: true
     - task: create-release 
       file: git-phlow/ci/tasks/gen-bin.yml
     - put: phlow-artifact-linux-s3
@@ -135,13 +137,10 @@ jobs:
   plan:
   - get: gp-version
   - get: git-phlow
-    passed: [integration-test]
   - get: phlow-artifact-linux-s3
     passed: [build-phlow-artifacts]
-    trigger: true
   - get: phlow-artifact-darwin-s3
     passed: [build-phlow-artifacts]
-    trigger: true
   - put: gh-release
     params:
       name: gp-version/version 
@@ -158,7 +157,7 @@ jobs:
     - get: git-phlow #contains the formula update script
     - get: gp-version
     - get: phlow-artifact-darwin-s3
-      passed: [shipit, build-phlow-artifacts]
+      passed: [shipit]
       trigger: true
   - task: brew-release
     file: git-phlow/ci/tasks/brew-release.yml

phlow/deliver.go

@@ -33,16 +33,19 @@ func Deliver(defaultBranch string) {
 	}
 
 	if err := githandler.BranchRename(branchInfo.Current); err != nil {
-		fmt.Println(err)
+		//Conflicting branch name
+		fmt.Printf("branch delivered/%s already exists in you local workspace \n", branchInfo.Current)
 		return
 	}
 
 	githandler.CheckOut(defaultBranch)
 	if err != nil {
-		fmt.Printf("Could not switch to branch %s \n", defaultBranch)
+		fmt.Printf("There are still changes in your workspace %s \n", defaultBranch)
+		fmt.Println("try: 'git status' to see the changes")
 		return
 	}
 
+	ui.PhlowSpinner.Stop()
 	fmt.Printf("Delivered branch %s \n", ui.Format.Branch(branchInfo.Current))
 }