From 0c8687f965a668544b4b97b23ac62ce64b4e70ee Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@inria.fr>
Date: Fri, 29 Nov 2024 11:31:20 +0100
Subject: [PATCH 1/2] Add test for lower bounds on dependencies.

This commit also updates a bit the compiler versions.
---
 .gitlab-ci.yml | 83 +++++++-------------------------------------------
 1 file changed, 11 insertions(+), 72 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4431dbd66d..f68475b8c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,9 +21,8 @@ before_script:
   - export OPAM_ROOT_DIR=${HOME}/opam-root-${COMPILER}-${OPAM_VERSION}-${OPAM_VARIANT}
   - export OPAM_ROOT_CACHE=${HOME}/opam-cache/cache-${COMPILER}-${OPAM_VERSION}-${OPAM_VARIANT}.tgz
   - apt-get update -qy
-  - apt-get install libgtksourceview2.0-dev -y || true # gone with Debian bullseye
   - apt-get install build-essential -y # missing with Debian bullseye
-  - apt-get install unzip libgtksourceview-3.0-dev libncurses5-dev curl jq ruby bubblewrap time libgmp-dev coinor-csdp libstring-shellquote-perl libipc-system-simple-perl automake autoconf libtool wdiff -y # wdiff is used in test-suite of hierarchy-builder
+  - apt-get install unzip libgtksourceview-3.0-dev libncurses5-dev curl jq ruby bubblewrap time libgmp-dev coinor-csdp libstring-shellquote-perl libipc-system-simple-perl automake autoconf libtool wdiff aspcud -y # wdiff is used in test-suite of hierarchy-builder
   - apt-get install clang -y
   - test -e $OPAM_ROOT_CACHE || scripts/opam-coq-init
   - curl -L https://github.com/ocaml/opam/releases/download/${OPAM_VERSION}/opam-${OPAM_VERSION}-x86_64-linux >/usr/local/bin/opam
@@ -95,93 +94,33 @@ opam-build:4.11.2:
   except:
     - web
 
-opam-build:4.14.0:
+opam-build:4.14.2:
   extends: .opam-build
   variables:
-    COMPILER: "4.14.0"
+    COMPILER: "4.14.2"
   except:
     - web
 
-opam-build:5.0.0:
+opam-build:4.14.2:minimal:
   extends: .opam-build
   variables:
-    COMPILER: "5.0.0"
+    COMPILER: "4.14.2"
+    OPAMSOLVERTIMEOUT: "300"
+    EXTRA_OPAM_OPTION: "--solver=aspcud --criteria=-count(removed),-count(down),-count(changed),+sum(changed,version-lag)"
   except:
     - web
 
-opam-build:any:
+opam-build:5.2.1:
   extends: .opam-build
   variables:
-    COMPILER: "4.09.0"
-    EXTRA_OPAM_OPTION: "--update-invariant"
+    COMPILER: "5.2.1"
   except:
     - web
 
-# Build without timeout
-opam-build-no-timeout:4.05.0:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.05.0"
-  only:
-    - web
-  tags:
-    - no-timeout
-
-opam-build-no-timeout:4.07.1:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.07.1"
-  only:
-    - web
-  tags:
-    - no-timeout
-
-opam-build-no-timeout:4.09.0:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.09.0"
-  only:
-    - web
-  tags:
-    - no-timeout
-
-opam-build-no-timeout:4.11.2:
+opam-build:any:
   extends: .opam-build
   variables:
     COMPILER: "4.11.2"
-  only:
-    - web
-  tags:
-    - no-timeout
-
-opam-build-no-timeout:4.13.1:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.13.1"
-  only:
-    - web
-  tags:
-    - no-timeout
-
-opam-build-no-timeout:any:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.09.0"
     EXTRA_OPAM_OPTION: "--update-invariant"
-  only:
+  except:
     - web
-  tags:
-    - no-timeout
-
-# JSON data
-# json-data:
-#   image: nixos/nix:2.3.12
-#   cache: {}
-#   before_script: []
-#   script:
-#     - nix-shell --run "dune exec --profile=release -- archive2web released extra-dev > coq-packages.json"
-#   artifacts:
-#     name: "$CI_JOB_NAME"
-#     paths:
-#       - coq-packages.json
-#     expire_in: 1 year

From 77328183b9b8b15d681276a0bcd8a7e77b26a063 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@inria.fr>
Date: Fri, 29 Nov 2024 11:33:12 +0100
Subject: [PATCH 2/2] Test

---
 .gitlab-ci.yml                                   | 14 --------------
 released/packages/coq-gappa/coq-gappa.1.5.5/opam |  1 -
 2 files changed, 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f68475b8c4..311ff26526 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,20 +80,6 @@ opam-lint:
     - scripts/opam-coq-list-pr-files | xargs scripts/opam-coq-lint
 
 # Build
-opam-build:4.07.1:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.07.1"
-  except:
-    - web
-
-opam-build:4.11.2:
-  extends: .opam-build
-  variables:
-    COMPILER: "4.11.2"
-  except:
-    - web
-
 opam-build:4.14.2:
   extends: .opam-build
   variables:
diff --git a/released/packages/coq-gappa/coq-gappa.1.5.5/opam b/released/packages/coq-gappa/coq-gappa.1.5.5/opam
index ed2d98e33c..c7444e3978 100644
--- a/released/packages/coq-gappa/coq-gappa.1.5.5/opam
+++ b/released/packages/coq-gappa/coq-gappa.1.5.5/opam
@@ -26,7 +26,6 @@ tags: [
   "logpath:Gappa"
   "date:2024-02-08"
 ]
-authors: [ "Guillaume Melquiond <guillaume.melquiond@inria.fr>" ]
 synopsis: "A Coq tactic for discharging goals about floating-point arithmetic and round-off errors using the Gappa prover"
 url {
   src: "https://gappa.gitlabpages.inria.fr/releases/gappalib-coq-1.5.5.tar.gz"