diff options
| author | Stefan M <StefMa@users.noreply.github.com> | 2019-09-25 09:45:28 +0300 |
|---|---|---|
| committer | StefMa <Stefan.May@grandcentrix.net> | 2019-09-25 11:03:56 +0300 |
| commit | 3ec8032f538fcef00c848420e5eeb4c040758fd2 (patch) | |
| tree | 638e69e85502d8bd1e8e504ad610d1265de6fbb3 | |
| parent | b70559551bee53647b6e5b21c42e4773b2446b7c (diff) | |
Fix CI for pull-requests
| -rw-r--r-- | .circleci/config.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 0edf2f8..acb4db1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,10 +22,13 @@ jobs: - run: working_directory: my-site/themes/hugo-fresh 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 checkout BRANCHNAME else + echo "Hello World else $CIRCLE_BRANCH" git checkout ${CIRCLE_BRANCH} fi @@ -33,9 +36,9 @@ jobs: name: Replace default config working_directory: my-site command: | - if [[ ${CIRCLE_BRANCH} == "*pull*" ]]; then - git fetch origin ${CIRCLE_BRANCH}/head:BRANCHNAME - branch=BRANCHNAME + isPrIfGreaterThanZero=$(expr $CIRCLE_BRANCH : "pull") + if [ isPrIfGreaterThanZero > 0 ]; then + branch=${CIRCLE_SHA1} else branch=${CIRCLE_BRANCH} fi @@ -47,7 +50,7 @@ jobs: working_directory: my-site command: | apk add sed - URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -) + URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -) if [ $CIRCLE_BRANCH == "master" ]; then URL=hugo-fresh fi @@ -63,7 +66,7 @@ jobs: name: Create now.json working_directory: my-site/public command: | - URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ -) + URL=hugo-fresh-$(echo $CIRCLE_BRANCH | tr _ - | tr / -) if [ $CIRCLE_BRANCH == "master" ]; then URL=hugo-fresh fi |