Skip to content
Snippets Groups Projects
Commit 70c0da4d authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

clean up buildkite output

parent ce578031
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.buildkite/merge_base_branch.sh
+ 3
− 1
View file @ 70c0da4d
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -e
if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs|release-.*)$ ]]; then if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs|release-.*)$ ]]; then
echo "Not merging forward, as this is a release branch" echo "Not merging forward, as this is a release branch"
...@@ -18,6 +18,8 @@ else ...@@ -18,6 +18,8 @@ else
GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
fi fi
echo "--- merge_base_branch $GITBASE"
# Show what we are before # Show what we are before
git --no-pager show -s git --no-pager show -s
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment