Merge pull request #887 from hyperledger/develop

Try to release 0.21.0 again
hyperledger-archives · Aug 21, 2018 · 735bcb7 · 735bcb7
2 parents 508664f + a2f6651
commit 735bcb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,8 +62,6 @@ jobs:
   push_docker_dev:
     <<: *defaults
     steps:
-      - attach_workspace:
-          at: .
       - setup_remote_docker:
           <<: *setup_docker
       # Only run on non-pull requests
@@ -72,6 +70,8 @@ jobs:
   release:
     <<: *defaults
     steps:
+      - setup_remote_docker:
+          <<: *setup_docker
       - checkout
       - run: make release
 

diff --git a/deploy/def/rule/rules.go b/deploy/def/rule/rules.go
@@ -89,7 +89,7 @@ func stripBraces(str string) string {
 	return str[start:]
 }
 
-var exampleAddress = acm.GeneratePrivateAccountFromSecret("marmot")
+var exampleAddress = acm.GeneratePrivateAccountFromSecret("marmot").Address()
 
 // Rules
 var (

diff --git a/deploy/jobs/job_manager.go b/deploy/jobs/job_manager.go
@@ -37,7 +37,7 @@ func RunJobs(do *def.Packages) error {
 
 	err = do.Validate()
 	if err != nil {
-		return fmt.Errorf("error validating Burrow package file at %s: %v", do.YAMLPath, err)
+		return fmt.Errorf("error validating Burrow deploy file at %s: %v", do.YAMLPath, err)
 	}
 
 	for _, job := range do.Package.Jobs {