diff options
| author | Enrico Tassi | 2018-05-31 10:09:49 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2018-05-31 10:09:49 +0200 |
| commit | 4598a26890a896ddcf6cd30758ae07882e245a16 (patch) | |
| tree | 9c5a1745c7d7bded6bafa2d4697f0a5433842267 | |
| parent | 57b47c3f390d85f0e69ecbf48947f495fafaff30 (diff) | |
| parent | 9531a44ecf57181c954ec41e66819899276c00c4 (diff) | |
Merge PR #7578: Allow make clean to work on a fresh clone
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | test-suite/Makefile | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d2fb1a4d8..5a9f1f5d5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,10 @@ before_script: &before_script steps: - checkout - run: *before_script + - run: &build-clean + name: Clean + command: | + make clean # ensure that `make clean` works on a fresh clone - run: &build-configure name: Configure command: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4784f0db08..05d2c635a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,10 @@ before_script: script: - set -e + - echo 'start:coq.clean' + - make clean # ensure that `make clean` works on a fresh clone + - echo 'end:coq.clean' + - echo 'start:coq.config' - ./configure -prefix "$(pwd)/_install_ci" ${COQ_EXTRA_CONF}"$COQ_EXTRA_CONF_QUOTE" - echo 'end:coq.config' @@ -84,6 +88,10 @@ before_script: script: - set -e + - echo 'start:coq.clean' + - make clean # ensure that `make clean` works on a fresh clone + - echo 'end:coq.clean' + - echo 'start:coq.config' - ./configure -local ${COQ_EXTRA_CONF} - echo 'end:coq.config' diff --git a/.travis.yml b/.travis.yml index 8218467d24..5c7fc5a338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -281,6 +281,10 @@ install: script: - set -e +- echo 'Testing make clean...' && echo -en 'travis_fold:start:coq.clean\\r' +- make clean # ensure that `make clean` works on a fresh clone +- echo -en 'travis_fold:end:coq.clean\\r' + - echo 'Configuring Coq...' && echo -en 'travis_fold:start:coq.config\\r' - ./configure ${COQ_DEST} -native-compiler ${NATIVE_COMP} ${EXTRA_CONF} - echo -en 'travis_fold:end:coq.config\\r' diff --git a/test-suite/Makefile b/test-suite/Makefile index ce21ff41c3..f41fb5b1e4 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -25,7 +25,7 @@ # Includes ########################################################################### -include ../config/Makefile +-include ../config/Makefile include ../Makefile.common ####################################################################### |