Fix CI for pull-requests

This commit is contained in:
Stefan M
2019-09-25 08:45:28 +02:00
committed by StefMa
parent b70559551b
commit 3ec8032f53

View File

@@ -22,10 +22,13 @@ jobs:
- run: - run:
working_directory: my-site/themes/hugo-fresh working_directory: my-site/themes/hugo-fresh
command: | command: |
if [[ ${CIRCLE_BRANCH} == "*pull*" ]]; then isPrIfGreaterThanZero=$(expr $CIRCLE_BRANCH : "pull")
if [ isPrIfGreaterThanZero > 0 ]; then
echo "Hello World $CIRCLE_BRANCH"
git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME
git checkout BRANCHNAME git checkout BRANCHNAME
else else
echo "Hello World else $CIRCLE_BRANCH"
git checkout ${CIRCLE_BRANCH} git checkout ${CIRCLE_BRANCH}
fi fi
@@ -33,9 +36,9 @@ jobs:
name: Replace default config name: Replace default config
working_directory: my-site working_directory: my-site
command: | command: |
if [[ ${CIRCLE_BRANCH} == "*pull*" ]]; then isPrIfGreaterThanZero=$(expr $CIRCLE_BRANCH : "pull")
git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME if [ isPrIfGreaterThanZero > 0 ]; then
branch=BRANCHNAME branch=${CIRCLE_SHA1}
else else
branch=${CIRCLE_BRANCH} branch=${CIRCLE_BRANCH}
fi fi
@@ -47,7 +50,7 @@ jobs:
working_directory: my-site working_directory: my-site
command: | command: |
apk add sed apk add sed
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -) URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -)
if [ $CIRCLE_BRANCH == "master" ]; then if [ $CIRCLE_BRANCH == "master" ]; then
URL=hugo-fresh URL=hugo-fresh
fi fi
@@ -63,7 +66,7 @@ jobs:
name: Create now.json name: Create now.json
working_directory: my-site/public working_directory: my-site/public
command: | command: |
URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -) URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -)
if [ $CIRCLE_BRANCH == "master" ]; then if [ $CIRCLE_BRANCH == "master" ]; then
URL=hugo-fresh URL=hugo-fresh
fi fi