remove redundant travis CI stages

2 files changed, 2 insertions, 58 deletions

diff --git a/.travis.yml b/.travis.yml
index d25cbe379..beaa0b536 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,58 +127,12 @@ jobs:
       env: COQ_VERSION="8.7.2"  COQ_PACKAGE="coq-8.7.2" PPA="ppa:jgross-h/many-coq-versions"
       script: PREV=pre-standalone CUR=coq ./etc/ci/travis.sh coq
 
-    - stage: no-curves-proofs
-      env: COQ_VERSION="master" COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-master-daily"
-      allow_failure: true
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-    - stage: no-curves-proofs
-      env: COQ_VERSION="v8.9"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.9-daily"
-      allow_failure: true
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-    - stage: no-curves-proofs
-      env: COQ_VERSION="v8.8"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.8-daily"
-      allow_failure: true
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-    - stage: no-curves-proofs
-      env: COQ_VERSION="v8.7"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.7-daily"
-      allow_failure: true
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-    - stage: no-curves-proofs
-      env: COQ_VERSION="8.8.2"  COQ_PACKAGE="coq-8.8.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-    - stage: no-curves-proofs
-      env: COQ_VERSION="8.7.2"  COQ_PACKAGE="coq-8.7.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=coq CUR=no-curves-proofs ./etc/ci/travis.sh no-curves-proofs
-
-    - stage: curves-proofs
-      env: COQ_VERSION="master" COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-master-daily"
-      allow_failure: true
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-    - stage: curves-proofs
-      env: COQ_VERSION="v8.9"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.9-daily"
-      allow_failure: true
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-    - stage: curves-proofs
-      env: COQ_VERSION="v8.8"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.8-daily"
-      allow_failure: true
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-    - stage: curves-proofs
-      env: COQ_VERSION="v8.7"   COQ_PACKAGE="coq"       PPA="ppa:jgross-h/coq-8.7-daily"
-      allow_failure: true
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-    - stage: curves-proofs
-      env: COQ_VERSION="8.8.2"  COQ_PACKAGE="coq-8.8.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-    - stage: curves-proofs
-      env: COQ_VERSION="8.7.2"  COQ_PACKAGE="coq-8.7.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=no-curves-proofs CUR=curves-proofs ./etc/ci/travis.sh curves-proofs
-
     - stage: standalone-ocaml
       env: COQ_VERSION="8.8.2"  COQ_PACKAGE="coq-8.8.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=curves-proofs CUR=standalone-ocaml ./etc/ci/travis.sh standalone-ocaml c-files test-c-files CC=gcc
+      script: PREV=coq CUR=standalone-ocaml ./etc/ci/travis.sh standalone-ocaml c-files test-c-files CC=gcc
     - stage: standalone-ocaml
       env: COQ_VERSION="8.7.2"  COQ_PACKAGE="coq-8.7.2" PPA="ppa:jgross-h/many-coq-versions"
-      script: PREV=curves-proofs CUR=standalone-ocaml ./etc/ci/travis.sh standalone-ocaml c-files test-c-files CC=gcc
+      script: PREV=coq CUR=standalone-ocaml ./etc/ci/travis.sh standalone-ocaml c-files test-c-files CC=gcc
 
 #    - stage: selected-test selected-bench
 #      env: COQ_VERSION="8.8.2"  COQ_PACKAGE="coq-8.8.2" PPA="ppa:jgross-h/many-coq-versions"
diff --git a/Makefile b/Makefile
index b62ce04b8..25a1ea652 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ INSTALLDEFAULTROOT := Crypto
 	util c-files \
 	nobigmem print-nobigmem \
 	lite only-heavy printlite \
-	curves-proofs no-curves-proofs \
 	some-early pre-standalone standalone standalone-haskell standalone-ocaml \
 	test-c-files
 
@@ -85,13 +84,6 @@ endif
 ifneq ($(filter util,$(MAKECMDGOALS)),)
 UTIL_VOFILES := $(call vo_closure,$(UTIL_PRE_VOFILES))
 endif
-ifneq ($(filter no-curves-proofs,$(MAKECMDGOALS)),)
-NO_CURVES_PROOFS_ALL_UNMADE_VOFILES := $(foreach vo,$(NO_CURVES_PROOFS_UNMADE_VOFILES),$(call vo_reverse_closure,$(VOFILES),$(vo)))
-NO_CURVES_PROOFS_VOFILES := $(filter-out $(NO_CURVES_PROOFS_ALL_UNMADE_VOFILES),$(REGULAR_VOFILES))
-endif
-ifneq ($(filter curves-proofs,$(MAKECMDGOALS)),)
-CURVES_PROOFS_VOFILES := $(call vo_closure,$(CURVES_PROOFS_PRE_VOFILES))
-endif
 ifneq ($(filter pre-standalone,$(MAKECMDGOALS)),)
 PRE_STANDALONE_VOFILES := $(call vo_closure,$(PRE_STANDALONE_PRE_VOFILES))
 endif
@@ -105,8 +97,6 @@ lite: $(LITE_VOFILES)
 nobigmem: $(NOBIGMEM_VOFILES)
 only-heavy: $(HEAVY_VOFILES)
 util: $(UTIL_VOFILES)
-curves-proofs: $(CURVES_PROOFS_VOFILES)
-no-curves-proofs: $(NO_CURVES_PROOFS_VOFILES)
 pre-standalone: $(PRE_STANDALONE_VOFILES)
 some-early: $(SOME_EARLY_VOFILES)