aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2018-07-01 02:31:28 +0200
committerGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2018-07-01 02:31:28 +0200
commit033c32a32fedcf2160bb38a3fed55efa9d1c2b77 (patch)
tree1f0cbefd43c0311051cd0af52422fd952b00d515
parent79792b84e7d2dfe49bf6b9d33b9f19feb90bc002 (diff)
parentffdf5c256cbe4be1743e17eb17d516fe987e3b8d (diff)
Merge PR #7964: Document that GITURL variables shouldn't have a trailing .git anymore.
-rw-r--r--dev/ci/user-overlays/07863-rm-sorts-contents.sh6
-rw-r--r--dev/ci/user-overlays/07906-univs-of-constr.sh9
-rw-r--r--dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh7
-rw-r--r--dev/ci/user-overlays/README.md2
4 files changed, 2 insertions, 22 deletions
diff --git a/dev/ci/user-overlays/07863-rm-sorts-contents.sh b/dev/ci/user-overlays/07863-rm-sorts-contents.sh
deleted file mode 100644
index 374a61484..000000000
--- a/dev/ci/user-overlays/07863-rm-sorts-contents.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$CI_PULL_REQUEST" = "7863" ] || [ "$CI_BRANCH" = "rm-sorts-contents" ]; then
- Elpi_CI_BRANCH=fix-sorts-contents
- Elpi_CI_GITURL=https://github.com/SkySkimmer/coq-elpi.git
-fi
diff --git a/dev/ci/user-overlays/07906-univs-of-constr.sh b/dev/ci/user-overlays/07906-univs-of-constr.sh
deleted file mode 100644
index 071665087..000000000
--- a/dev/ci/user-overlays/07906-univs-of-constr.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$CI_PULL_REQUEST" = "7906" ] || [ "$CI_BRANCH" = "univs-of-constr-noseff" ]; then
- Equations_CI_BRANCH=fix-univs-of-constr
- Equations_CI_GITURL=https://github.com/SkySkimmer/Coq-Equations.git
-
- Elpi_CI_BRANCH=fix-universes-of-constr
- Elpi_CI_GITURL=https://github.com/SkySkimmer/coq-elpi.git
-fi
diff --git a/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh b/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh
deleted file mode 100644
index b4d3d7e67..000000000
--- a/dev/ci/user-overlays/7080-herbelin-master+swapping-modules-constr-context.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ "$CI_PULL_REQUEST" = "7080" ] || [ "$CI_BRANCH" = "master+swapping-modules-constr-context" ]; then
- Equations_CI_BRANCH=master+adapting-coq-pr7080
- Equations_CI_GITURL=https://github.com/herbelin/Coq-Equations.git
-
- Elpi_CI_BRANCH=coq-master+adapting-coq-pr7080
- Elpi_CI_GITURL=https://github.com/herbelin/coq-elpi.git
-fi
diff --git a/dev/ci/user-overlays/README.md b/dev/ci/user-overlays/README.md
index 11e4d9ae0..d38d1b06d 100644
--- a/dev/ci/user-overlays/README.md
+++ b/dev/ci/user-overlays/README.md
@@ -9,6 +9,8 @@ testing is possible. It redefines some variables from
[`ci-basic-overlay.sh`](../ci-basic-overlay.sh):
give the name of your branch using a `_CI_BRANCH` variable and the location of
your fork using a `_CI_GITURL` variable.
+The `_CI_GITURL` variable should be the URL of the repository without a
+trailing `.git`.
Moreover, the file contains very simple logic to test the pull request number
or branch name and apply it only in this case.