Support commit_range env var in branch_range config

semaphoreci · Apr 22, 2021 · d4e949c · d4e949c
1 parent cd82bf8
commit d4e949c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/when/changein/parser.go b/pkg/when/changein/parser.go
@@ -182,6 +182,11 @@ func (p *parser) BranchRange(defaultBranch string) (string, error) {
 		return "", err
 	}
 
+	if found && branchRange == "$SEMAPHORE_GIT_COMMIT_RANGE" {
+		branchRange = p.fetchCommitRange(defaultBranch)
+		return branchRange, nil
+	}
+
 	if !found {
 		branchRange = "$SEMAPHORE_MERGE_BASE...$SEMAPHORE_GIT_SHA"
 	}

diff --git a/test/e2e/change_in_branch_range.rb b/test/e2e/change_in_branch_range.rb
@@ -26,6 +26,10 @@
   - name: Test4
     run:
       when: "branch = 'master' and change_in(['/lib', 'log.txt'], {branch_range: 'dev...$SEMAPHORE_GIT_SHA'})"
+
+  - name: Test5
+    run:
+      when: "branch = 'master' and change_in(['/lib'], {branch_range: '$SEMAPHORE_GIT_COMMIT_RANGE'})"
 }
 
 origin = TestRepoForChangeIn.setup()
@@ -74,4 +78,8 @@
   - name: Test4
     run:
       when: "(branch = 'master') and true"
+
+  - name: Test5
+    run:
+      when: "(branch = 'master') and true"
 }))