From 0a062afffa0a75b76ce028d9086a985ede0de760 Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Wed, 19 Jan 2022 15:47:41 +0100
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b07558deb..a1c540fa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,8 @@
-# This file is a template, and might need editing before it works on your project.
-# To contribute improvements to CI/CD templates, please follow the Development guide at:
-# https://docs.gitlab.com/ee/development/cicd/templates.html
-# This specific template is located at:
-# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
-
-# Build a Docker image with CI/CD and push to the GitLab registry.
-# Docker-in-Docker documentation: https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
-#
-# This template uses one generic job with conditional builds
-# for the default branch and all other (MR) branches.
-
-docker-build:
- # Use the official docker image.
+docker-create-manylinux-build-env:
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
- stage: build
+ stage: .pre
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- |
@@ -27,8 +14,24 @@ docker-build:
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
- /kaniko/executor --cache=false --context $CI_PROJECT_DIR/deploy/build_env/manylinux2010 --dockerfile $CI_PROJECT_DIR/deploy/build_env/manylinux2010/Dockerfile --destination $CI_REGISTRY_IMAGE${tag}
- # Run this job in a branch where a Dockerfile exists
+ tags:
+ - kubernetes-executor
+ rules:
+ - when: manual
+
+windows-build-debug:
+ image:
+ name: $CI_REGISTRY_IMAGE/asapo-windows-build-env:latest
+ entrypoint: ["cmd", "/S", "/C"]
+ stage: build
+ script:
+ - SET GOPATH="c:\Program Files\golang"
+ - SET PKG_CONFIG_PATH="C:/opt/vcpkg/installed/x64-windows/lib/pkgconfig"
+#cmake -DLIBCURL_DIR=c:/Curl -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_TOOLCHAIN_FILE=C:/opt/vcpkg/scripts/buildsystems/vcpkg.cmake -DRdKafka_DIR="c:/opt/vcpkg/installed/x64-windows" -Dgtest_SOURCE_DIR=c:/googletest -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_DOCS=ON -DBUILD_INTEGRATION_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_PYTHON=OFF -DBUILD_CONSUMER_TOOLS=ON -Dlibmongoc-static-1.0_DIR="c:\mongo-c-driver\lib\cmake\libmongoc-static-1.0" -Dlibbson-static-1.0_DIR="c:\mongo-c-driver\lib\cmake\libbson-static-1.0" -DBUILD_EVENT_MONITOR_PRODUCER=ON ..
+ - cmake -DLIBCURL_DIR=c:/opt/vcpkg/installed/x64-windows -DRdKafka_DIR=c:/opt/vcpkg/installed/x64-windows -Dgtest_SOURCE_DIR=c:/opt/vcpkg/installed/x64-windows -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_DOCS=ON -DBUILD_EXAMPLES=ON -DBUILD_PYTHON=OFF -DBUILD_CONSUMER_TOOLS=ON -Dlibmongoc-static-1.0_DIR="c:/opt/vcpkg/installed/x64-windows\lib\cmake\libmongoc-static-1.0" -Dlibbson-static-1.0_DIR="c:/opt/vcpkg/installed/x64-windows\lib\cmake\libbson-static-1.0" -DBUILD_EVENT_MONITOR_PRODUCER=ON ..
+ - cmake --build . -j 4
+ - ctest -C Debug -T test --no-compress-output --output-on-failure
+ tags:
+ - docker-windows
rules:
- - if: $CI_COMMIT_BRANCH
- exists:
- - deploy/build_env/manylinux2010/Dockerfile
+ - when: always
\ No newline at end of file
--
GitLab