flywithu/community-catalog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the pull request branch issues (#274)

Browse Source
This commit is contained in:
Bill Maxwell 2016-09-09 10:51:56 -07:00 committed by GitHub
parent 31b91bc31a
commit 95c24738db
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@ -1,7 +1,6 @@
--- ---
pipeline: pipeline:
build: build:
privileged: true
image: rancher/dind:v0.6.0 image: rancher/dind:v0.6.0
commands: commands:
- ./scripts/ci - ./scripts/ci

4
scripts/test
View File

@ -6,6 +6,10 @@ cd $(dirname $0)/..
trap "rm -rf /scratch/*" exit trap "rm -rf /scratch/*" exit
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [ -n "${DRONE_BRANCH}" ]; then
git checkout -b ${DRONE_BRANCH}
GIT_BRANCH=${DRONE_BRANCH}
fi
if [ "$GIT_BRANCH" != "master" ]; then if [ "$GIT_BRANCH" != "master" ]; then
sed -i "s#master#$GIT_BRANCH#" ./scripts/repo.json sed -i "s#master#$GIT_BRANCH#" ./scripts/repo.json