Skip to content

Commit 317cb7e

Browse files
committed
Test for docker compose41
Signed-off-by: Marcel Wagner <[email protected]>
1 parent 2c3a47f commit 317cb7e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

.circleci/config.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,15 @@ commands:
3030
shell: /bin/bash
3131
name: Setup branch
3232
command: |
33-
if [ "$CIRCLE_BRANCH" = "develop" ]; then
34-
git branch --set-upstream-to=origin/develop develop
33+
sudo apt install jq
34+
echo $CIRCLE_PR_REPONAME
35+
url="https://api.github.com/repos/Open-IoT-Service-Platform/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER?access_token=$GITHUB_TOKEN"
36+
target_branch=$(curl "$url" | ./jq '.base.ref' | tr -d '"')
37+
echo Marcel822 ${target_branch}
38+
if [ ! "$CIRCLE_BRANCH" = "master" ]; then
39+
git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
40+
fi
41+
if [ "$CIRCLE_BRANCH" = "develop"]; then
3542
make update
3643
fi
3744
build-branch:
@@ -123,8 +130,8 @@ workflows:
123130
- build:
124131
filters:
125132
branches:
126-
only:
127-
- develop
133+
ignore:
134+
- master
128135
- build-master:
129136
filters:
130137
branches:

0 commit comments

Comments
 (0)