From 17da2e2a21bb3eb37bfc2a3b0dbba12fdcd04a1d Mon Sep 17 00:00:00 2001 From: longpanda Date: Fri, 29 Jan 2021 13:02:51 +0800 Subject: [PATCH] update CI build script --- .github/workflows/ci.yml | 10 ++++++++-- DOC/prepare_env.sh | 8 ++++++++ Dockerfile | 10 +++++----- EDK2/build.sh | 1 - INSTALL/all_in_one.sh | 11 ++++++++++- 5 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 DOC/prepare_env.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a7da188..aa09d624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,8 @@ on: branches: [ master ] pull_request: branches: [ master ] + + workflow_dispatch: jobs: build: @@ -15,10 +17,14 @@ jobs: run: docker-compose up - uses: actions/upload-artifact@v2 with: + name: ventoy-windows + path: INSTALL/ventoy-*windows* + - uses: actions/upload-artifact@v2 + with: name: ventoy-linux path: INSTALL/ventoy-*linux* - uses: actions/upload-artifact@v2 with: - name: ventoy-windows - path: INSTALL/ventoy-*windows* + name: ventoy-livecd + path: INSTALL/ventoy-*livecd* diff --git a/DOC/prepare_env.sh b/DOC/prepare_env.sh new file mode 100644 index 00000000..1a9e869f --- /dev/null +++ b/DOC/prepare_env.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +#[ -d /opt/diet64 ] || sh ./installdietlibc.sh + +[ -d /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu ] || tar xf /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz -C /opt + +[ -d /opt/aarch64--uclibc--stable-2020.08-1 ] || tar xf /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2 -C /opt + diff --git a/Dockerfile b/Dockerfile index 06221bc0..e6b7ef48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,13 @@ RUN yum -y install \ mpfr.i686 mpfr-devel.i686 zlib.i686 rsync autogen autoconf automake libtool gettext* bison binutils \ flex device-mapper-devel SDL libpciaccess libusb freetype freetype-devel gnu-free-* qemu-* virt-* \ libvirt* vte* NetworkManager-bluetooth brlapi fuse-devel dejavu* gnu-efi* pesign shim \ - iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static + iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static xorriso CMD cd /ventoy \ && wget -P DOC/ https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz \ + && wget -P DOC/ https://musl.libc.org/releases/musl-1.2.1.tar.gz \ && wget -P GRUB2/ https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz \ && wget -O EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 \ - && wget -O ExFAT/exfat-1.3.0.zip https://codeload.github.com/relan/exfat/zip/v1.3.0 \ - && wget -O ExFAT/libfuse-fuse-2.9.9.zip https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9 \ - && cd INSTALL && ls -la && sh all_in_one.sh - + && 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 diff --git a/EDK2/build.sh b/EDK2/build.sh index 63227643..7e659c54 100644 --- a/EDK2/build.sh +++ b/EDK2/build.sh @@ -38,7 +38,6 @@ rm -f $DST_PATH3 source ./edksetup.sh if [ "$EDKARCH" = "AARCH64" ]; then - PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin \ GCC48_AARCH64_PREFIX=aarch64-linux-gnu- \ build -p MdeModulePkg/MdeModulePkg.dsc -a $EDKARCH -b RELEASE -t GCC48 else diff --git a/INSTALL/all_in_one.sh b/INSTALL/all_in_one.sh index a90d967c..e828d313 100644 --- a/INSTALL/all_in_one.sh +++ b/INSTALL/all_in_one.sh @@ -3,7 +3,10 @@ VTOY_PATH=$PWD/.. cd $VTOY_PATH/DOC -sh installdietlibc.sh +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 + cd $VTOY_PATH/GRUB2 sh buildgrub.sh || exit 1 @@ -58,6 +61,12 @@ sh buildedk.sh || exit 1 # sh build.sh 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 +fi + sh ventoy_pack.sh || exit 1 echo -e '\n============== SUCCESS ==================\n'