diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-06-02 09:10:28 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-06-02 09:10:28 +0000 |
| commit | a49e935ee3e2e07d90da7c78b543a5592a3b1a4a (patch) | |
| tree | 960dbaa58768be8e1e05dc098743d560ee3ec4c8 /.gitlab/build.yml | |
| parent | 0b976fcffe0a9b8e80587adb076bcdf279c9331c (diff) | |
| parent | 16b452b82b08ecaeef1dde3c1cb6fd2ab0446947 (diff) | |
Merge branch '212919-pull-custom-conan-packages' into 'master'v3.11.0
Allow custom conan configuration
See merge request gitlab-org/security-products/license-management!159
Diffstat (limited to '.gitlab/build.yml')
| -rw-r--r-- | .gitlab/build.yml | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/.gitlab/build.yml b/.gitlab/build.yml index 772bde3..6cc7807 100644 --- a/.gitlab/build.yml +++ b/.gitlab/build.yml @@ -1,3 +1,19 @@ +build-conan-pkg: + image: conanio/gcc7 + stage: build + script: + - cd spec/fixtures/c/conan/example-package/ + - conan remote add gitlab $CI_API_V4_URL/packages/conan True + - export ESCAPED_NAMESPACE="${CI_PROJECT_NAMESPACE//\//+}" + - export PACKAGE_NAME=$ESCAPED_NAMESPACE+$CI_PROJECT_NAME/stable + - echo $PACKAGE_NAME + - conan create . "$PACKAGE_NAME" + - conan upload "example/0.1@$PACKAGE_NAME" --all --remote=gitlab + variables: + CONAN_LOGIN_USERNAME: 'ci_user' + CONAN_PASSWORD: $CI_JOB_TOKEN + allow_failure: true + build-docker-image: image: docker:stable interruptible: true @@ -8,8 +24,8 @@ build-docker-image: script: - docker info - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - docker pull $CI_REGISTRY_IMAGE:latest || true - - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $TMP_IMAGE . + - docker pull $LATEST_IMAGE || true + - docker build --cache-from $LATEST_IMAGE -t $TMP_IMAGE . - docker image inspect $TMP_IMAGE --format='{{.Size}}' - docker push $TMP_IMAGE |