From db1d884dfe52e3f8849f9981f7ff861e741c4654 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 27 Oct 2018 11:24:40 +0100
Subject: [PATCH] ci option already existed
---
src/freedombone-image | 8 +-------
src/freedombone-image-make | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/freedombone-image b/src/freedombone-image
index 0d86232be..c702cdf65 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -71,7 +71,6 @@ MAKEFILE=${PROJECT_NAME}-image-makefile
IMAGE_SIZE=7.9G
IMAGE_SIZE_SPECIFIED=
IMAGE_NAME='full'
-BUILD_WITHIN_CI='no'
USERNAME="$USER"
PASSWORD=
@@ -343,10 +342,6 @@ do
shift
BUILD_LOG="$1"
;;
- --continuous-integration)
- shift
- BUILD_WITHIN_CI='yes'
- ;;
-u|--user|--username)
shift
USERNAME="$1"
@@ -656,8 +651,7 @@ make "$IMAGE_TYPE" \
EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
LOCAL_NAME="$LOCAL_NAME" \
- BUILD_LOG="$BUILD_LOG" \
- BUILD_WITHIN_CI="$BUILD_WITHIN_CI"
+ BUILD_LOG="$BUILD_LOG"
# shellcheck disable=SC2181
if [ ! "$?" = "0" ]; then
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index 7fb2805f1..ccb3bfd97 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -277,7 +277,7 @@ if [ ! "$BUILD_LOG" ]; then
fi
# append continuous integration option
-if [[ "$BUILD_WITHIN_CI" == 'y'* ]]; then
+if [[ "$CONTINUOUS_INTEGRATION" == 'y'* ]]; then
extra_opts="$extra_opts\
--continuous-integration"
fi
--
GitLab