From 0b67aa0521b93218f2d2dc9b20960848ba895a28 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Wed, 26 Dec 2018 00:11:52 +0100
Subject: [PATCH] Add patching to build step
---
.gitlab-ci.yml | 9 ++++++---
patches/.keep | 0
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 patches/.keep
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea09e9d..ea0a318 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,13 @@ build:
- ./.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) $BROKEN" | 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) $BROKEN" | tee -a debug.log
- # In the past this build step repeatedly broke
- # - ./.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 clean -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+ # Apply patches
+ - ./.gitlab-ci/patch.sh patches gluon
+ # Build
- ./.gitlab-ci/build.sh -c build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all) $BROKEN" | tee -a debug.log
+ # Revert patches
+ - ./.gitlab-ci/patch.sh -r patches gluon
# 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) $BROKEN" | tee -a debug.log
# Sign
diff --git a/patches/.keep b/patches/.keep
new file mode 100644
index 0000000..e69de29
--
GitLab