Browse Source

Continuous integration build option

Bob Mottram 6 years ago
parent
commit
dfc1272cb3

+ 7
- 0
src/freedombone-image View File

@@ -74,6 +74,8 @@ IMAGE_NAME='full'
74 74
 USERNAME="$USER"
75 75
 PASSWORD=
76 76
 
77
+CONTINUOUS_INTEGRATION=
78
+
77 79
 # IP address of the router (gateway)
78 80
 ROUTER_IP_ADDRESS="192.168.1.254"
79 81
 
@@ -378,6 +380,10 @@ do
378 380
             shift
379 381
             INTERACTIVE="$1"
380 382
             ;;
383
+        --ci)
384
+            shift
385
+            CONTINUOUS_INTEGRATION="$1"
386
+            ;;
381 387
         -g|--generic)
382 388
             shift
383 389
             GENERIC_IMAGE="$1"
@@ -614,6 +620,7 @@ make "$IMAGE_TYPE" \
614 620
      AMNESIC="$AMNESIC" \
615 621
      SOCIALINSTANCE="$SOCIALINSTANCE" \
616 622
      EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
623
+     CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
617 624
      LOCAL_NAME="$LOCAL_NAME"
618 625
 
619 626
 # shellcheck disable=SC2181

+ 2
- 0
src/freedombone-image-customise View File

@@ -139,6 +139,8 @@ BMX6_COMMIT='39dd1f2d99ac5a3fa28e92f8173c15039132e181'
139 139
 BMX7_REPO="https://github.com/bmx-routing/bmx7"
140 140
 BMX7_COMMIT='0a82c7c10fef44b259b35e77ab33632aa132d219'
141 141
 
142
+CONTINUOUS_INTEGRATION=
143
+
142 144
 PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
143 145
 
144 146
 # Whether to use a SATA drive and if so what its device/partition name is

+ 2
- 0
src/freedombone-image-make View File

@@ -78,6 +78,7 @@ export AMNESIC
78 78
 export SOCIALINSTANCE
79 79
 export LOCAL_NAME
80 80
 export EXTERNAL_DRIVE
81
+export CONTINUOUS_INTEGRATION
81 82
 
82 83
 # Locate vmdebootstrap program fetched in Makefile
83 84
 basedir=`pwd`
@@ -228,6 +229,7 @@ sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" "$TEMP_CUSTO
228 229
 sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" "$TEMP_CUSTOMISE3"
229 230
 sed -i "s|EXTERNAL_DRIVE=.*|EXTERNAL_DRIVE=\"${EXTERNAL_DRIVE}\"|g" "$TEMP_CUSTOMISE3"
230 231
 sed -i 's|#!/bin/bash||g' "$TEMP_CUSTOMISE3"
232
+sed -i "s|CONTINUOUS_INTEGRATION=.*|CONTINUOUS_INTEGRATION=${CONTINUOUS_INTEGRATION}|g" "$TEMP_CUSTOMISE3"
231 233
 
232 234
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
233 235
 if [ -f $TEMP_CUSTOMISE ]; then

+ 4
- 2
src/freedombone-image-makefile View File

@@ -41,8 +41,10 @@ IMAGE = $(NAME).img
41 41
 ARCHIVE = $(IMAGE).xz
42 42
 SIGNATURE = $(ARCHIVE).sig
43 43
 OWNER = 1000
44
-XZ = xz --no-warn --verbose --keep --threads=0 -3
45
-SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
44
+if [ ! "$CONTINUOUS_INTEGRATION" ];
45
+    XZ = xz --no-warn --verbose --keep --threads=0 -3
46
+    SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
47
+fi
46 48
 
47 49
 # settings for `make test`
48 50
 TEST_SSH_PORT = 2222