Skip to content

Commit 1f16313

Browse files
authored
feat: branch support for Buddy (#366)
1 parent b7824c9 commit 1f16313

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ the Pull Request originated.
8888
| [Bamboo](https://confluence.atlassian.com/bamboo/bamboo-variables-289277087.html) | `bamboo` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
8989
| [Bitbucket](https://confluence.atlassian.com/bitbucket/environment-variables-794502608.html) | `bitbucket` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :white_check_mark: |
9090
| [Bitrise](https://devcenter.bitrise.io/builds/available-environment-variables/#exposed-by-bitriseio) | `bitrise` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |
91-
| [Buddy](https://buddy.works/knowledge/deployments/how-use-environment-variables#default-environment-variables) | `buddy` | :white_check_mark: | [:warning:](#buddy) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: |
91+
| [Buddy](https://buddy.works/knowledge/deployments/how-use-environment-variables#default-environment-variables) | `buddy` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :x: |
9292
| [Buildkite](https://buildkite.com/docs/builds/environment-variables) | `buildkite` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
9393
| [CircleCI](https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables) | `circleci` | :white_check_mark: | [:warning:](#circleci) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: |
9494
| [Cirrus CI](https://cirrus-ci.org/guide/writing-tasks/#environment-variables) | `cirrus` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
@@ -164,17 +164,6 @@ detached `HEAD` to determine the branch from which the detached `HEAD` was creat
164164
In the rare case where there is multiple remote branches with the same `HEAD` as the local detached `HEAD`, `env-ci`
165165
will arbitrarily pick the first one. This can lead to an inaccurate `branch` value in such circumstances.
166166

167-
### Buddy
168-
169-
For builds triggered when [a Pull Request is opened/updated](https://buddy.works/knowledge/deployments/pull-requests),
170-
Buddy doesn't provide an environment variable indicating the branch from which the Pull Request originated nor the
171-
target branch. It also build from a branch named `pull/<PR number>` so the target branch cannot be determined with
172-
a `git` command.
173-
Therefore, in the case of Pull Request builds, `env-ci` will not be able to determine the `branch` and `prBranch`
174-
properties.
175-
176-
See [feature request](https://forum.buddy.works/t/determine-pull-request-branch-with-environment-variable/911).
177-
178167
### CircleCI
179168

180169
For builds triggered when a Pull Request is opened/updated, CircleCI doesn't provide an environment variable indicating

services/buddy.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export default {
1717
tag: env.BUDDY_EXECUTION_TAG,
1818
build: env.BUDDY_EXECUTION_ID,
1919
buildUrl: env.BUDDY_EXECUTION_URL,
20-
branch: isPr ? undefined : env.BUDDY_EXECUTION_BRANCH,
20+
branch: isPr
21+
? env.BUDDY_EXECUTION_PULL_REQUEST_HEAD_BRANCH
22+
: env.BUDDY_EXECUTION_BRANCH,
2123
pr,
2224
isPr,
2325
slug: env.BUDDY_REPO_SLUG,

0 commit comments

Comments
 (0)