aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-08-07 08:10:50 +0200
committerrubo77 <github@r.z11.de>2018-08-07 20:25:39 +0200
commit615df7a6870eae0ded8845ddbfcd4a31219a270b (patch)
treed2b4b5d3163c0b81ccc0275184630dd2f8531b53
parentd30ae1e016590568535188b57c03597937193f93 (diff)
moved contrib/build-container and gitlab-ci/ to .gitlab-ci/
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--.gitlab-ci/build-container/Dockerfile (renamed from contrib/build-container/Dockerfile)0
-rwxr-xr-x.gitlab-ci/build.sh (renamed from gitlab-ci/build.sh)0
-rwxr-xr-x.gitlab-ci/update-git.sh (renamed from gitlab-ci/update-git.sh)0
4 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9462269..e048d52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ prepare:
- docker info
- docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $CONTAINER_IMAGE:latest || true
- - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE:$CI_COMMIT_SHA -t $CONTAINER_IMAGE:latest contrib/build-container
+ - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE:$CI_COMMIT_SHA -t $CONTAINER_IMAGE:latest .gitlab-ci/build-container
- docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
- docker push $CONTAINER_IMAGE:latest
cache: {}
@@ -38,18 +38,18 @@ build:
script:
- export FORCE_UNSAFE_CONFIGURE=1
# former clone step
- - ./gitlab-ci/update-git.sh | tee -a debug.log
- - ./gitlab-ci/build.sh -c update -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+ - ./.gitlab-ci/update-git.sh | tee -a debug.log
+ - ./.gitlab-ci/build.sh -c update -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
# We should never need this, should we?
- - ./gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+ - ./.gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
# In the past this build step repeadatly break
- # - ./gitlab-ci/build.sh -c download -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log
- - ./gitlab-ci/build.sh -c build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+ # - ./.gitlab-ci/build.sh -c download -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) V=s" | tee -a debug.log
+ - ./.gitlab-ci/build.sh -c build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
# Bring gluon repo to cacheable state
- - ./gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+ - ./.gitlab-ci/build.sh -c clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
# Sign
- echo $SIGNING_KEY > signing_key
- - ./gitlab-ci/build.sh -c sign -b $CI_COMMIT_REF_NAME -s $(pwd)/signing_key
+ - ./.gitlab-ci/build.sh -c sign -b $CI_COMMIT_REF_NAME -s $(pwd)/signing_key
artifacts:
untracked: false
paths:
@@ -67,7 +67,7 @@ upload:
- ssh-add <(echo "$SSH_KEY")
# create fake gluon dir to satisfy build script
- mkdir -p gluon
- - ./gitlab-ci/build.sh -c upload -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID
+ - ./.gitlab-ci/build.sh -c upload -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID
dependencies:
- build
cache: {}
diff --git a/contrib/build-container/Dockerfile b/.gitlab-ci/build-container/Dockerfile
index c448193..c448193 100644
--- a/contrib/build-container/Dockerfile
+++ b/.gitlab-ci/build-container/Dockerfile
diff --git a/gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 9068be8..9068be8 100755
--- a/gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
diff --git a/gitlab-ci/update-git.sh b/.gitlab-ci/update-git.sh
index 48a78f8..48a78f8 100755
--- a/gitlab-ci/update-git.sh
+++ b/.gitlab-ci/update-git.sh