Skip to content
Snippets Groups Projects
Commit db1d884d authored by Bob Mottram's avatar Bob Mottram
Browse files

ci option already existed

parent 439641f9
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,6 @@ MAKEFILE=${PROJECT_NAME}-image-makefile ...@@ -71,7 +71,6 @@ MAKEFILE=${PROJECT_NAME}-image-makefile
IMAGE_SIZE=7.9G IMAGE_SIZE=7.9G
IMAGE_SIZE_SPECIFIED= IMAGE_SIZE_SPECIFIED=
IMAGE_NAME='full' IMAGE_NAME='full'
BUILD_WITHIN_CI='no'
USERNAME="$USER" USERNAME="$USER"
PASSWORD= PASSWORD=
...@@ -343,10 +342,6 @@ do ...@@ -343,10 +342,6 @@ do
shift shift
BUILD_LOG="$1" BUILD_LOG="$1"
;; ;;
--continuous-integration)
shift
BUILD_WITHIN_CI='yes'
;;
-u|--user|--username) -u|--user|--username)
shift shift
USERNAME="$1" USERNAME="$1"
...@@ -656,8 +651,7 @@ make "$IMAGE_TYPE" \ ...@@ -656,8 +651,7 @@ make "$IMAGE_TYPE" \
EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \ EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \ CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
LOCAL_NAME="$LOCAL_NAME" \ LOCAL_NAME="$LOCAL_NAME" \
BUILD_LOG="$BUILD_LOG" \ BUILD_LOG="$BUILD_LOG"
BUILD_WITHIN_CI="$BUILD_WITHIN_CI"
# shellcheck disable=SC2181 # shellcheck disable=SC2181
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
......
...@@ -277,7 +277,7 @@ if [ ! "$BUILD_LOG" ]; then ...@@ -277,7 +277,7 @@ if [ ! "$BUILD_LOG" ]; then
fi fi
# append continuous integration option # append continuous integration option
if [[ "$BUILD_WITHIN_CI" == 'y'* ]]; then if [[ "$CONTINUOUS_INTEGRATION" == 'y'* ]]; then
extra_opts="$extra_opts\ extra_opts="$extra_opts\
--continuous-integration" --continuous-integration"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment