Merge PR #8412: [dune] [ci] Fix and test release profile + use 1.1 dune-workspace

5 files changed, 25 insertions, 13 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f770feded..693a0b6bf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,6 +89,7 @@ after_script:
     - set +e
 
 .dune-template: &dune-template
+  dependencies: []
   stage: build
   artifacts:
     name: "$CI_JOB_NAME"
@@ -97,9 +98,7 @@ after_script:
     expire_in: 1 week
   script:
     - set -e
-    - echo 'start:coq.dune'
-    - make -f Makefile.dune world
-    - echo 'end:coq.dune'
+    - make -f Makefile.dune "$DUNE_TARGET"
     - set +e
 
 # every non build job must set dependencies otherwise all build
@@ -217,10 +216,11 @@ build:edge+flambda:
     COQ_EXTRA_CONF: "-native-compiler yes -coqide opt -flambda-opts "
     COQ_EXTRA_CONF_QUOTE: "-O3 -unbox-closures"
 
-build:egde:dune:
+build:egde:dune:dev:
   <<: *dune-template
   variables:
     OPAM_SWITCH: edge
+    DUNE_TARGET: world
 
 windows64:
   <<: *windows-template
@@ -234,6 +234,12 @@ windows32:
   except:
     - /^pr-.*$/
 
+pkg:dune-release:
+  <<: *dune-template
+  stage: test
+  variables:
+    OPAM_SWITCH: edge
+    DUNE_TARGET: release
 
 pkg:nix:
   image: nixorg/nix:latest # Minimal NixOS image which doesn't even contain git
diff --git a/Makefile.dune b/Makefile.dune
index 6056151c0d..f90f555557 100644
--- a/Makefile.dune
+++ b/Makefile.dune
@@ -10,10 +10,11 @@ BUILD_CONTEXT=_build/default
 
 help:
 	@echo "Welcome to Coq's Dune-based build system. Targets are:"
-	@echo "  - states: build a minimal functional coqtop"
-	@echo "  - world:  build all binaries and libraries"
-	@echo "  - clean:  remove build directory and autogenerated files"
-	@echo "  - help:   show this message"
+	@echo "  - states:  build a minimal functional coqtop"
+	@echo "  - world:   build all binaries and libraries"
+	@echo "  - release: build Coq in release mode"
+	@echo "  - clean:   remove build directory and autogenerated files"
+	@echo "  - help:    show this message"
 
 voboot:
 	dune build $(DUNEOPT) @vodeps
@@ -25,6 +26,9 @@ states: voboot
 world: voboot
 	dune build $(DUNEOPT) @install
 
+release: voboot
+	dune build $(DUNEOPT) -p coq
+
 clean:
 	dune clean
 
diff --git a/dune b/dune
index 2a77d62a16..b758fc7b56 100644
--- a/dune
+++ b/dune
@@ -9,7 +9,3 @@
  (name vodeps)
  (deps tools/coq_dune.exe .vfiles.d))
   ; (action (run coq_dune .vfiles.d))))
-
-; Add custom flags here. Default developer profile is `dev`
-(env
- (dev (flags :standard -rectypes -w -9-27-50)))
diff --git a/dune-project b/dune-project
index b98bfa1013..6ce4ec4717 100644
--- a/dune-project
+++ b/dune-project
@@ -1,3 +1,3 @@
-(lang dune 1.0)
+(lang dune 1.1)
 
 (name coq-devel)
diff --git a/dune-workspace b/dune-workspace
new file mode 100644
index 0000000000..682631e7dc
--- /dev/null
+++ b/dune-workspace
@@ -0,0 +1,6 @@
+(lang dune 1.1)
+
+; Add custom flags here. Default developer profile is `dev`
+(env
+ (dev     (flags :standard -rectypes -w -9-27-50))
+ (release (flags :standard -rectypes)))