MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update CI

This commit is contained in:
longpanda 2021-01-29 20:58:02 +08:00
parent 519fac719e
commit 18f35dafbf
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL/ventoy_pack.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
if [ "$1" = "CI" ]; then if [ "$1" = "CI" ]; then
OPT='' OPT='-dR'
else else
OPT='-a' OPT='-a'
fi fi
@ -140,10 +140,10 @@ rm -rf $tmpdir
cd ../LiveCD cd ../LiveCD
if [ "$1" = "CI" ]; then if [ "$1" = "CI" ]; then
echo "=============== run docker_ci.sh ===============" echo "=============== run docker_ci.sh ==============="
sh docker_ci.sh sh docker_ci.sh $1
fi fi
echo "=============== run livecd.sh ===============" echo "=============== run livecd.sh ==============="
sh livecd.sh sh livecd.sh $1
cd $CurDir cd $CurDir
mv ../LiveCD/ventoy*.iso ./ mv ../LiveCD/ventoy*.iso ./

20
LiveCD/livecd.sh
View File

@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
if [ "$1" = "CI" ]; then
OPT='-dR'
else
OPT='-a'
fi
VENTOY_PATH=$PWD/../ VENTOY_PATH=$PWD/../
if ! [ -f $VENTOY_PATH/INSTALL/grub/grub.cfg ]; then if ! [ -f $VENTOY_PATH/INSTALL/grub/grub.cfg ]; then
@ -15,9 +21,9 @@ if ! [ -e $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ]; then
fi fi
rm -rf ISO_TMP rm -rf ISO_TMP
cp -a ISO ISO_TMP cp $OPT ISO ISO_TMP
cp -a VTOY VTOY_TMP cp $OPT VTOY VTOY_TMP
ls -la ls -la
if ! [ -d ISO_TMP ]; then if ! [ -d ISO_TMP ]; then
@ -39,9 +45,9 @@ find . | cpio -o -H newc | gzip -c -9 > ../ISO_TMP/EFI/ventoy/ventoy.gz
cd .. && rm -rf VTOY_TMP cd .. && rm -rf VTOY_TMP
cp -a $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ISO_TMP/EFI/ventoy/ cp $OPT $VENTOY_PATH/INSTALL/ventoy-${version}-linux.tar.gz ISO_TMP/EFI/ventoy/
cp -a GRUB/cdrom.img ISO_TMP/EFI/boot/ cp $OPT GRUB/cdrom.img ISO_TMP/EFI/boot/
cp -a GRUB/bootx64.efi ISO_TMP/EFI/boot/ cp $OPT GRUB/bootx64.efi ISO_TMP/EFI/boot/
rm -rf efimnt rm -rf efimnt
@ -52,11 +58,11 @@ dd if=/dev/zero of=efi.img bs=1M count=2
mkfs.vfat efi.img mkfs.vfat efi.img
mount efi.img efimnt mount efi.img efimnt
mkdir -p efimnt/EFI/boot mkdir -p efimnt/EFI/boot
cp -a GRUB/bootx64.efi efimnt/EFI/boot/ cp $OPT GRUB/bootx64.efi efimnt/EFI/boot/
umount efimnt umount efimnt
sync sync
cp -a efi.img ISO_TMP/EFI/boot/ cp $OPT efi.img ISO_TMP/EFI/boot/
rm -rf efimnt rm -rf efimnt
rm -f efi.img rm -f efi.img