update CI script

diff --git a/INSTALL/all_in_one.sh b/INSTALL/all_in_one.sh
index a4298c7168eb9a40f87423dc2789b1c83602ff1f..14163f38535dd6f69059b0861406464d2f4a53dd 100644 (file)
--- a/INSTALL/all_in_one.sh
+++ b/INSTALL/all_in_one.sh
@@ -2,26 +2,29 @@
 
 VTOY_PATH=$PWD/..
 
 
 VTOY_PATH=$PWD/..
 

+cilog() {
+    datestr=$(date +"%Y/%m/%d %H:%M:%S")
+    echo "$datestr $*"
+}
+

 LOG=$VTOY_PATH/DOC/build.log
 [ -f $LOG ] && rm -f $LOG
 
 cd $VTOY_PATH/DOC
 LOG=$VTOY_PATH/DOC/build.log
 [ -f $LOG ] && rm -f $LOG
 
 cd $VTOY_PATH/DOC

-echo "prepare_env ..."
+cilog "prepare_env ..."

 sh prepare_env.sh
 
 export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin:/opt/mips-loongson-gcc7.3-linux-gnu/2019.06-29/bin/:/opt/mips64el-linux-musl-gcc730/bin/
 
 sh prepare_env.sh
 
 export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin:/opt/mips-loongson-gcc7.3-linux-gnu/2019.06-29/bin/:/opt/mips64el-linux-musl-gcc730/bin/
 

-
-echo "build grub2 ..."
+cilog "build grub2 ..."

 cd $VTOY_PATH/GRUB2
 cd $VTOY_PATH/GRUB2

-#sh buildgrub.sh >> $LOG 2>&1 || exit 1
-sh buildgrub.sh
+sh buildgrub.sh >> $LOG 2>&1 || exit 1

 
 

-echo "build ipxe ..."
+cilog "build ipxe ..."

 cd $VTOY_PATH/IPXE
 sh buildipxe.sh >> $LOG 2>&1 || exit 1
 
 cd $VTOY_PATH/IPXE
 sh buildipxe.sh >> $LOG 2>&1 || exit 1
 

-echo "build edk2 ..."
+cilog "build edk2 ..."

 cd $VTOY_PATH/EDK2
 sh buildedk.sh >> $LOG 2>&1 || exit 1
 
 cd $VTOY_PATH/EDK2
 sh buildedk.sh >> $LOG 2>&1 || exit 1
 


@@ -75,7 +78,7 @@ if [ "$1" = "CI" ]; then
     sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg
 fi
 
     sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg
 fi
 

-echo "packing ventoy-$Ver ..."
+cilog "packing ventoy-$Ver ..."

 sh ventoy_pack.sh $1 >> $LOG 2>&1 || exit 1
 
 echo -e '\n============== SUCCESS ==================\n'
 sh ventoy_pack.sh $1 >> $LOG 2>&1 || exit 1
 
 echo -e '\n============== SUCCESS ==================\n'

diff --git a/INSTALL/docker_ci_build.sh b/INSTALL/docker_ci_build.sh
index be245020d2c1244701e76d3c33ffec22dff148bf..7b7db0d4ee84c984e154de615993f20741892350 100644 (file)
--- a/INSTALL/docker_ci_build.sh
+++ b/INSTALL/docker_ci_build.sh
@@ -2,7 +2,9 @@
 
 VTOY_PATH=$PWD/..
 
 
 VTOY_PATH=$PWD/..
 

+date +"%Y/%m/%d %H:%M:%S"

 echo downloading envrionment ...
 echo downloading envrionment ...

+

 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/dietlibc-0.34.tar.xz
 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/musl-1.2.1.tar.gz
 wget -q -P $VTOY_PATH/GRUB2/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/grub-2.04.tar.xz
 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/dietlibc-0.34.tar.xz
 wget -q -P $VTOY_PATH/DOC/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/musl-1.2.1.tar.gz
 wget -q -P $VTOY_PATH/GRUB2/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/grub-2.04.tar.xz


@@ -11,4 +13,7 @@ wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/g
 wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/aarch64--uclibc--stable-2020.08-1.tar.bz2
 wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
 
 wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/aarch64--uclibc--stable-2020.08-1.tar.bz2
 wget -q -P /opt/ https://github.com/ventoy/vtoytoolchain/releases/download/1.0/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
 

+date +"%Y/%m/%d %H:%M:%S"
+echo downloading envrionment finish...
+

 sh all_in_one.sh CI
 sh all_in_one.sh CI