AuxXxilium/arc
1
0
Fork 0
mirror of https://github.com/AuxXxilium/arc.git synced 2024-11-24 02:19:54 +07:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

build: change order to get files

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium 2024-06-19 17:51:20 +02:00
parent f999ad2821
commit 292b319730
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/autobuild.yml vendored
View File

@ -64,6 +64,8 @@ jobs:
getPatches "files/p3/patches" getPatches "files/p3/patches"
getTheme "files/p1/boot/grub" getTheme "files/p1/boot/grub"
getOffline "files/p3/configs" getOffline "files/p3/configs"
br_version="2023.11.x"
getBuildroot "${br_version}" "br"
echo "OK" echo "OK"
@ -86,8 +88,6 @@ jobs:
sudo mount ${LOOPX}p1 "/tmp/p1" sudo mount ${LOOPX}p1 "/tmp/p1"
sudo mount ${LOOPX}p3 "/tmp/p3" sudo mount ${LOOPX}p3 "/tmp/p3"
echo "Get Buildroot"
getBuildroot "2023.11.x" "br"
[ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1 [ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1
echo "Repack initrd" echo "Repack initrd"

6
.github/workflows/build.yml vendored
View File

@ -138,6 +138,9 @@ jobs:
getTheme "files/p1/boot/grub" getTheme "files/p1/boot/grub"
echo "THEMETAG=${TAG}" >> $GITHUB_ENV echo "THEMETAG=${TAG}" >> $GITHUB_ENV
getOffline "files/p3/configs" getOffline "files/p3/configs"
echo "Get Buildroot"
br_version="2023.11.x"
getBuildroot "${br_version}" "br"
echo "OK" echo "OK"
@ -160,9 +163,6 @@ jobs:
sudo mount ${LOOPX}p1 "/tmp/p1" sudo mount ${LOOPX}p1 "/tmp/p1"
sudo mount ${LOOPX}p3 "/tmp/p3" sudo mount ${LOOPX}p3 "/tmp/p3"
echo "Get Buildroot"
br_version="2023.11.x"
getBuildroot "${br_version}" "br"
[ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1 [ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1
echo "Repack initrd" echo "Repack initrd"

2
.github/workflows/custom.yml vendored
View File

@ -137,7 +137,7 @@ jobs:
echo "$(cat "${PRESET_CONFIG_FILE}")" echo "$(cat "${PRESET_CONFIG_FILE}")"
echo "arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}" >"/tmp/automated" echo "arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}" >"/tmp/automated"
sudo cp -f "/tmp/automated" "/tmp/p3/automated" sudo cp -f "/tmp/automated" "/tmp/p3/automated"
echo "Copying files" echo "Syncing files"
sync sync
echo "Unmount image file" echo "Unmount image file"

1
Taskfile.yaml
View File

@ -5,6 +5,7 @@ version: "3"
tasks: tasks:
build-img: build-img:
cmds: cmds:
- git pull
- ./img-gen.sh - ./img-gen.sh
compile-kpatch: compile-kpatch:

5
img-gen.sh
View File

@ -16,6 +16,7 @@ getConfigs "files/p3/configs"
getPatches "files/p3/patches" getPatches "files/p3/patches"
getTheme "files/p1/boot/grub" getTheme "files/p1/boot/grub"
getOffline "files/p3/configs" getOffline "files/p3/configs"
getBuildroot "2023.11.x" "br"
IMAGE_FILE="arc.img" IMAGE_FILE="arc.img"
gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
@ -32,10 +33,6 @@ mkdir -p "/tmp/p3"
sudo mount ${LOOPX}p1 "/tmp/p1" sudo mount ${LOOPX}p1 "/tmp/p1"
sudo mount ${LOOPX}p3 "/tmp/p3" sudo mount ${LOOPX}p3 "/tmp/p3"
echo "Get Buildroot"
# read -rp 'Version (2023.08.x): ' br_version
[ -z "${br_version}" ] && br_version="2023.11.x"
getBuildroot "${br_version}" "br"
[[ ! -f "br/bzImage-arc" || ! -f "br/initrd-arc" ]] && return 1 [[ ! -f "br/bzImage-arc" || ! -f "br/initrd-arc" ]] && return 1
VERSION=$(date +'%y.%-m.dev') VERSION=$(date +'%y.%-m.dev')