From b691578c9186b65ec93dbc3c8eede7075ae35876 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Wed, 12 Jun 2019 13:11:17 +0200 Subject: [PATCH] Gitlab fiddling --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b0cf96..beb7453 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - sh generate_makefile.sh - make -f Makefile.working prepare + - export GIT_BRANCH=$CI_COMMIT_REF_SLUG - printenv | sort after_script: @@ -23,6 +24,6 @@ build:marshall:master: stage: build script: - make -f Makefile.working build-marshall - - GIT_BRANCH=$CI_COMMIT_REF_SLUG make -f Makefile.working push-marshall + - make -f Makefile.working push-marshall only: - master