Merge remote-tracking branch 'gitlab.toppoint/release-candidate'

.gitignore

@@ -1,2 +1,5 @@
 *~
 download/index.html
+/signing_key
+*.log
+/gluon

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
   CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/build
   GLUON_GIT: https://github.com/freifunk-gluon/gluon.git
   GLUON_BRANCH: v2018.1.x
+  BROKEN: BROKEN=1
 
 cache:
   key: $CI_COMMIT_REF_SLUG-$GLUON_GIT-$GLUON_BRANCH
@@ -39,17 +40,20 @@ build:
     - 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/build.sh -c update -b rc -a stable -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)" | 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 build -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID -m "-j $(nproc --all)" | tee -a debug.log
+    - ./.gitlab-ci/build.sh -c clean -b rc -a stable -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 rc -a stable -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)" | tee -a debug.log
+    - ./.gitlab-ci/build.sh -c clean -b rc -a stable -n $CI_PIPELINE_ID -m "-j $(nproc --all) $BROKEN" | 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 rc -a stable -s $(pwd)/signing_key
   artifacts:
     untracked: false
     paths:

.gitlab-ci/build-container/Dockerfile

@@ -1,17 +1,17 @@
 FROM debian:stretch
 
 RUN apt-get update && apt-get install -y \
-	git \
-	subversion \
-	python \
-	build-essential \
-	gawk \
-	unzip \
-	libncurses5-dev \
-	zlib1g-dev \
+    git \
+    subversion \
+    python \
+    build-essential \
+    gawk \
+    unzip \
+    libncurses5-dev \
+    zlib1g-dev \
     libssl1.0-dev \
-	wget \
-	curl \
+    wget \
+    curl \
     openssh-client
 RUN apt-get update && apt-get install -y \
     cmake \
@@ -36,4 +36,3 @@ RUN apt-get update && apt-get install -y \
     cd ~ && \
     rm -rf ~/libuecc && \
     rm -rf ~/ecdsautils
-