Auto merge pull request #636 from atomist/sdm

* Add targets.branch to code transforms * Update to latest matching automation-client version
atomist · Dec 20, 2018 · 1e1a125 · 1e1a125
1 parent 2c9adf4
commit 1e1a125
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 132 deletions.
diff --git a/lib/api/command/target/BitBucketRepoTargets.ts b/lib/api/command/target/BitBucketRepoTargets.ts
@@ -44,8 +44,11 @@ export class BitBucketRepoTargets extends TargetsParams implements FallbackParam
     @MappedParameter(MappedParameters.GitHubRepository, false)
     public repo: string;
 
-    @Parameter({ description: "Branch or ref. Defaults to 'master'", ...validationPatterns.GitBranchRegExp, required: false })
-    public sha: string = "master";
+    @Parameter({ description: "Ref", ...validationPatterns.GitShaRegExp, required: false })
+    public sha: string;
+
+    @Parameter({ description: "Branch Defaults to 'master'", ...validationPatterns.GitBranchRegExp, required: false })
+    public branch: string = "master";
 
     @Parameter({ description: "regex", required: false })
     public repos: string = ".*";
@@ -68,7 +71,7 @@ export class BitBucketRepoTargets extends TargetsParams implements FallbackParam
                 this.apiUrl,
                 this.owner, this.repo,
                 true,
-                this.sha) :
+                this.branch ? this.branch : this.sha) :
             undefined;
     }
 

diff --git a/lib/api/command/target/GitHubRepoTargets.ts b/lib/api/command/target/GitHubRepoTargets.ts
@@ -20,8 +20,11 @@ export class GitHubRepoTargets extends GitHubTargetsParams implements FallbackPa
     @MappedParameter(MappedParameters.GitHubRepository, false)
     public repo: string;
 
-    @Parameter({ description: "Branch or ref. Defaults to 'master'", ...validationPatterns.GitBranchRegExp, required: false })
-    public sha: string = "master";
+    @Parameter({ description: "Ref", ...validationPatterns.GitShaRegExp, required: false })
+    public sha: string;
+
+    @Parameter({ description: "Branch", ...validationPatterns.GitBranchRegExp, required: false })
+    public branch: string = "master";
 
     @Parameter({ description: "regex", required: false })
     public repos: string;