diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-16 00:34:00 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-05-16 00:34:00 +0200 |
| commit | f2e59e74aeaa8ce9a0317cb87eae99fb0ec14ae3 (patch) | |
| tree | 3e3c9d4ef3abc5267f8b6d3cce9b215c29657103 /dev/ci | |
| parent | 76c3b46299f670f5c4dff8d1baa3fe705326d3a0 (diff) | |
| parent | b08a074b6430e1f273d7ea0bd6f14463e32a6135 (diff) | |
Merge PR #7505: Pick up user overlays when running GitLab CI on PRs.
Diffstat (limited to 'dev/ci')
| -rw-r--r-- | dev/ci/ci-common.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev/ci/ci-common.sh b/dev/ci/ci-common.sh index 189734a0b..2a14ed352 100644 --- a/dev/ci/ci-common.sh +++ b/dev/ci/ci-common.sh @@ -10,6 +10,10 @@ if [ -n "${GITLAB_CI}" ]; then export COQBIN="$PWD/_install_ci/bin" export CI_BRANCH="$CI_COMMIT_REF_NAME" + if [[ ${CI_BRANCH#pr-} =~ ^[0-9]*$ ]] + then + export CI_PULL_REQUEST="${CI_BRANCH#pr-}" + fi else if [ -n "${TRAVIS}" ]; then |