[ci] Remove OCaml "trunk" CI jobs.

It will take non-trivial effort to make Coq work with OCaml >= 4.10.0.

3 files changed, 2 insertions, 66 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3646abc29..f2823c90c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -501,62 +501,6 @@ test-suite:egde:dune:dev:
     # Gitlab doesn't support yet "expire_in: never" so we use the instance default
     # expire_in: never
 
-test-suite:edge+trunk+make:
-  stage: stage-1
-  dependencies: []
-  script:
-    - opam switch create 4.09.0 --empty
-    - eval $(opam env)
-    - opam repo add ocaml-beta https://github.com/ocaml/ocaml-beta-repository.git
-    - opam update
-    - opam install ocaml-variants=4.09.0+trunk
-    - opam pin add -n ocamlfind --dev
-    - opam install num
-    - eval $(opam env)
-    # We avoid problems with warnings:
-    - ./configure -profile devel -warn-error no
-    - make -j "$NJOBS" world
-    - make -j "$NJOBS" test-suite UNIT_TESTS=
-  variables:
-    OPAM_SWITCH: base
-  artifacts:
-    name: "$CI_JOB_NAME.logs"
-    when: always
-    paths:
-      - test-suite/logs
-    expire_in: 1 week
-  allow_failure: true
-  only: *full-ci
-
-test-suite:edge+trunk+dune:
-  stage: stage-1
-  dependencies: []
-  script:
-    - opam switch create 4.09.0 --empty
-    - eval $(opam env)
-    - opam repo add ocaml-beta https://github.com/ocaml/ocaml-beta-repository.git
-    - opam update
-    - opam install ocaml-variants=4.09.0+trunk
-    - opam pin add -n ocamlfind --dev
-    - opam pin add dune --dev # ounit lablgtk conf-gtksourceview
-    - opam install dune num
-    - eval $(opam env)
-    # We use the release profile to avoid problems with warnings
-    - make -f Makefile.dune trunk
-    - export COQ_UNIT_TEST=noop
-    - dune runtest --profile=ocaml409
-  variables:
-    OPAM_SWITCH: base
-  artifacts:
-    name: "$CI_JOB_NAME.logs"
-    when: always
-    paths:
-      - _build/log
-      - _build/default/test-suite/logs
-    expire_in: 1 week
-  allow_failure: true
-  only: *full-ci
-
 test-suite:base+async:
   extends: .test-suite-template
   dependencies:
diff --git a/Makefile.dune b/Makefile.dune
index 88055d62dc..19e8a770bd 100644
--- a/Makefile.dune
+++ b/Makefile.dune
@@ -6,7 +6,7 @@
 .PHONY: quickbyte quickopt quickide                   # Partial / quick developer targets
 .PHONY: refman-html stdlib-html apidoc                # Documentation targets
 .PHONY: test-suite release                            # Accessory targets
-.PHONY: ocheck trunk ireport clean                    # Maintenance targets
+.PHONY: ocheck ireport clean                          # Maintenance targets
 
 # use DUNEOPT=--display=short for a more verbose build
 # DUNEOPT=--display=short
@@ -36,7 +36,6 @@ help:
 	@echo "  - release:     build Coq in release mode"
 	@echo ""
 	@echo "  - ocheck:  build for all supported OCaml versions [requires OPAM]"
-	@echo "  - trunk:   build with a configuration compatible with OCaml trunk"
 	@echo "  - ireport: build with optimized flambda settings and emit an inline report"
 	@echo "  - clean:   remove build directory and autogenerated files"
 	@echo "  - help:    show this message"
@@ -103,11 +102,6 @@ release: voboot
 ocheck: voboot
 	dune build $(DUNEOPT) @install --workspace=dev/dune-workspace.all
 
-trunk:
-	dune build $(DUNEOPT) --profile=ocaml409 @vodeps
-	dune exec coq_dune $(BUILD_CONTEXT)/.vfiles.d
-	dune build $(DUNEOPT) --profile=ocaml409 coq.install coqide-server.install
-
 ireport:
 	dune clean
 	dune build $(DUNEOPT) @vodeps --profile=ireport
diff --git a/dune b/dune
index 6fb0612e4e..832c864fc3 100644
--- a/dune
+++ b/dune
@@ -4,9 +4,7 @@
  (release (flags :standard -rectypes)
           (ocamlopt_flags -O3 -unbox-closures))
  (ireport (flags :standard -rectypes -w -9-27-40+60)
-          (ocamlopt_flags :standard -O3 -unbox-closures -inlining-report))
- (ocaml409
-  (flags :standard -strict-sequence -strict-formats -keep-locs -rectypes -w -9-27+40+60 -warn-error -5 -alert --deprecated)))
+          (ocamlopt_flags :standard -O3 -unbox-closures -inlining-report)))
 
 ; Information about flags for release mode:
 ;