From 5dc8eaa8f404ad76b8a46acdc00d2690c5cf523f Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 23 Jul 2021 23:01:05 +0200
Subject: [PATCH] [enh] Fix gitlab CI
---
.gitlab-ci.yml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fec331613..e571cc5e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
# ---------------------------------------------------------------
variables:
- CI_BUILD_TYPES_IMAGE: $CI_REGISTRY_IMAGE/build-types:develop
+ CI_BUILD_TYPES_BUNDLE_IMAGE: $CI_REGISTRY_IMAGE/build-types:develop
# ---------------------------------------------------------------
# Jobs templates
@@ -57,7 +57,7 @@ variables:
build-types-bundle:
extends: .build-types-bundle
- image: ${CI_BUILD_TYPES_IMAGE}
+ image: ${CI_BUILD_TYPES_BUNDLE_IMAGE}
before_script:
- mv /tmp/.build-cache/types-bundle/node_modules ./types-bundle/
# only:
@@ -68,7 +68,8 @@ failsafe-build-types-bundle:
stage: alt_build
when: on_failure
before_script:
- - cd types-bundle && yarn
+ - cd types-bundle
+ - yarn
# only:
# - develop
@@ -97,8 +98,8 @@ docker:ci:
- echo "RUN diff /tmp/before.txt /tmp/after.txt || true" >> Dockerfile
- echo 'WORKDIR /build' >> Dockerfile
# Build and push the CI image
- - docker build --no-cache -t ${CI_BUILD_TYPES_IMAGE} .
- - docker push ${CI_BUILD_TYPES_IMAGE}
+ - docker build --no-cache -t ${CI_BUILD_TYPES_BUNDLE_IMAGE} .
+ - docker push ${CI_BUILD_TYPES_BUNDLE_IMAGE}
artifacts:
paths:
- dist/ci/Dockerfile
--
GitLab