Skip to content

Commit 81a37e4

Browse files
Fix coverage metadata commit info (#1323)
1 parent f578fed commit 81a37e4

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.buildkite/scripts/gen_coverage_metadata.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,23 @@ set -ex
99
# commit-sha: 6953daa563e8e44512bc349c9608484cfd4ec4ff
1010
# timestamp: 2024-03-04T19:29:16Z
1111

12+
# Required env variables:
13+
# - BUILDKITE_BRANCH
14+
# - BUILDKITE_COMMIT
15+
1216
output_path="$1"
1317

14-
echo "commit-sha: $(git rev-parse HEAD)" > "$output_path"
18+
if [ "$BUILDKITE_BRANCH" != "master" ] && [ "$BUILDKITE_BRANCH" != "origin/master" ]; then
19+
echo "Coverage metadata is only generated for master branch. Current branch: $BUILDKITE_BRANCH"
20+
exit 0
21+
fi
22+
23+
if [ -z "$BUILDKITE_COMMIT" ]; then
24+
echo "BUILDKITE_COMMIT is not set"
25+
exit 1
26+
fi
27+
28+
echo "commit-sha: $BUILDKITE_COMMIT" > "$output_path"
1529
echo "timestamp: $(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$output_path"
1630

1731
echo "Coverage metadata written to $output_path"

docker/buildkite/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ services:
8181
dockerfile: ./docker/buildkite/Dockerfile
8282
environment:
8383
- "GO111MODULE=on"
84+
- BUILDKITE_BRANCH
85+
- BUILDKITE_COMMIT
8486
volumes:
8587
- ../../:/go/src/go.uber.org/cadence
8688
networks:

0 commit comments

Comments
 (0)