From 812e9c44a422122e2cbf88fdc7cbb93ce8de74e2 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Sat, 24 Mar 2018 14:07:31 +0100
Subject: [PATCH] we can't use variables in 'only:', so go back to
OPAM_PKG_BRANCH
---
.gitlab-ci.yml | 3 +--
ci | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a87248346..5f9a61f32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ stages:
variables:
CPU_CORES: "10"
- MAIN_BRANCH: "master"
GIT_SUBMODULE_STRATEGY: "recursive"
.template: &template
@@ -19,7 +18,7 @@ variables:
paths:
- opamroot/
only:
- - "$MAIN_BRANCH"
+ - master
- /^ci/
except:
- triggers
diff --git a/ci b/ci
index 60286c6bb..df14cb051 160000
--- a/ci
+++ b/ci
@@ -1 +1 @@
-Subproject commit 60286c6bb8a9f9ec21f0097530ccd39c9fc44930
+Subproject commit df14cb0514bf51e7e08d255238470c175eadb435
--
GitLab