From 116280a36e32cb85c58a2b1bb8ffafcbf65e9f34 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Wed, 30 Sep 2020 22:28:45 -0400
Subject: [PATCH] Split CI out into two builds under the same stage.
---
.gitlab-ci.yml | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af2b06b..b20b272 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,20 @@
image: docker:stable
-#services:
-# - docker:stable-dind
+services:
+ - docker:stable-dind
variables:
REPOSITORY: "aparapi/aparapi"
VERSION: "2.0.0"
- #DOCKER_HOST: "tcp://docker:2375"
- #DOCKER_TLS_CERTDIR: ""
- #DOCKER_TLS_CERTDIR: "/certs"
- #DOCKER_HOST: tcp://docker:2375
- #DOCKER_TLS_CERTDIR: ""
before_script:
- echo "${DOCKER_TOKEN}" | docker login --username "${DOCKER_USER}" --password-stdin
stages:
- - opencl
+ - deploy
-.opencl_template: &opencl_definition
- stage: opencl
+amdgpu:
+ stage: deploy
script:
- if [ $CI_COMMIT_REF_NAME == "develop" ]; then
REV="git";
@@ -28,17 +23,11 @@ stages:
else
REV="$CI_COMMIT_REF_NAME";
fi
- - docker pull "${REPOSITORY}-nvidia:${REV}" || true
- - docker build --network=host --pull -t "${REPOSITORY}-nvidia:${REV}"
- --cache-from "${REPOSITORY}-nvidia:${REV}"
- --build-arg "aparapiver=${VERSION}"
- "nvidia/"
- docker pull "${REPOSITORY}-amdgpu:${REV}" || true
- docker build --network=host --pull -t "${REPOSITORY}-amdgpu:${REV}"
--cache-from "${REPOSITORY}-amdgpu:${REV}"
--build-arg "aparapiver=${VERSION}"
"amdgpu/"
- - docker push "${REPOSITORY}-nvidia"
- docker push "${REPOSITORY}-amdgpu"
only:
- master
@@ -47,5 +36,25 @@ stages:
tags:
- dind
-opencl:
- <<: *opencl_definition
+amdgpu:
+ stage: deploy
+ script:
+ - if [ $CI_COMMIT_REF_NAME == "develop" ]; then
+ REV="git";
+ elif [ $CI_COMMIT_REF_NAME == "master" ]; then
+ REV="latest";
+ else
+ REV="$CI_COMMIT_REF_NAME";
+ fi
+ - docker pull "${REPOSITORY}-nvidia:${REV}" || true
+ - docker build --network=host --pull -t "${REPOSITORY}-nvidia:${REV}"
+ --cache-from "${REPOSITORY}-nvidia:${REV}"
+ --build-arg "aparapiver=${VERSION}"
+ "nvidia/"
+ - docker push "${REPOSITORY}-nvidia"
+ only:
+ - master
+ - develop
+ - tags
+ tags:
+ - dind
--
GitLab