From b1ad99cde0605b4e1bfe0bd66a8485604bf125e5 Mon Sep 17 00:00:00 2001 From: longpanda Date: Fri, 29 Jan 2021 14:26:02 +0800 Subject: [PATCH] update CI script --- .github/workflows/ci.yml | 5 ++++- Dockerfile | 2 +- INSTALL/all_in_one.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b9d335a..afab8460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,4 +27,7 @@ jobs: 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 e6b7ef48..a0ba0470 100644 --- 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 \ - && 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 e828d313..d50f15f2 100644 --- 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) - 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