summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2020-07-30 00:37:17 +0200
committerBoris Faure <billiob@gmail.com>2020-08-10 22:44:03 +0200
commitd723da8f2a9987869d44e1b06060d71b53a9082f (patch)
tree0db06ce2451167a0a8a3dc8dfa270255c33ca443
parentdf6b0138956fbe923f68d63567747ea88562718c (diff)
circleci: run with bash when needed
(cherry picked from commit ec844ee798c695bbd73897dd9e760fb9b3e6aa3b)
-rw-r--r--.circleci/config.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3bc95cc..ac95562 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,20 +1,24 @@
1version: 2 1version: 2.1
2 2
3jobs: 3jobs:
4 checkout_code: 4 checkout_code:
5 docker: 5 docker:
6 - image: borisfaure/terminology-ci:latest 6 - image: borisfaure/terminology-ci:latest
7 shell: /bin/sh -leo pipefail
8 environment:
9 - BASH_ENV: /etc/profile
7 steps: 10 steps:
8 - run: | 11 - run: |
9 cd /terminology 12 cd /terminology
10 git pull --ff-only 13 git pull --ff-only
11 if [ -n "$CIRCLE_PR_NUMBER" ]; then 14 if [ -n "$CIRCLE_PR_NUMBER" ]; then
12 git fetch origin pull/$CIRCLE_PR_NUMBER/head 15 git fetch origin pull/$CIRCLE_PR_NUMBER/head
13 fi
14 if [ -n "$CIRCLE_SHA1" ]; then
15 git reset --hard $CIRCLE_SHA1
16 else 16 else
17 git reset --hard origin/master 17 if [ -n "$CIRCLE_SHA1" ]; then
18 git reset --hard $CIRCLE_SHA1
19 else
20 git reset --hard origin/master
21 fi
18 fi 22 fi
19 - save_cache: 23 - save_cache:
20 key: checkout-{{ .Environment.CIRCLE_SHA1 }} 24 key: checkout-{{ .Environment.CIRCLE_SHA1 }}
@@ -57,6 +61,9 @@ jobs:
57 build_and_test_debug_gcc_efl_latest: 61 build_and_test_debug_gcc_efl_latest:
58 docker: 62 docker:
59 - image: borisfaure/terminology-ci:latest 63 - image: borisfaure/terminology-ci:latest
64 shell: /bin/sh -leo pipefail
65 environment:
66 - BASH_ENV: /etc/profile
60 steps: 67 steps:
61 - restore_cache: 68 - restore_cache:
62 key: checkout-{{ .Environment.CIRCLE_SHA1 }} 69 key: checkout-{{ .Environment.CIRCLE_SHA1 }}