update CI script

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b9d335a13e1eb329e85b96c36d76d5178ceaa13..afab84601290e8e0d3fef91d629f99af35dbb637 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,4 +27,7 @@ jobs:
       with:
         name: ventoy-livecd
         path: INSTALL/ventoy-*livecd*
       with:
         name: ventoy-livecd
         path: INSTALL/ventoy-*livecd*

-
+    - uses: actions/upload-artifact@v2
+      with:
+        name: build-log
+        path: DOC/build.log

diff --git a/Dockerfile b/Dockerfile
index e6b7ef48b82bac2fe8ff22b818783f71494f3e4a..a0ba0470bed7ad24a1a8eb6dd584372fa739d473 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,4 +14,4 @@ CMD cd /ventoy \
     && wget -O EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 \
     && wget -P /opt/ https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz  \
     && wget -P /opt/ https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2  \
     && wget -O EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 \
     && wget -P /opt/ https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz  \
     && wget -P /opt/ https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2  \

-    && cd INSTALL && ls -la && sh all_in_one.sh CI
+    && cd INSTALL && ls -la && sh all_in_one.sh CI > DOC/build.log 2>&1

diff --git a/INSTALL/all_in_one.sh b/INSTALL/all_in_one.sh
index e828d31310028e40d85212b341d402b5f8c0010e..d50f15f243c76bc5752415ea284929f706807b77 100644 (file)
--- a/INSTALL/all_in_one.sh
+++ b/INSTALL/all_in_one.sh
@@ -64,7 +64,7 @@ cd $VTOY_PATH/INSTALL
 
 if [ "$1" = "CI" ]; then
     Ver=$(date +%m%d%H%M)
 
 if [ "$1" = "CI" ]; then
     Ver=$(date +%m%d%H%M)

-    sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=$Ver/"  -i ./grub/grub.cfg
+    sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg

 fi
 
 sh ventoy_pack.sh || exit 1
 fi
 
 sh ventoy_pack.sh || exit 1