diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2aae6d9a..7013bcb4 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -64,6 +64,8 @@ jobs: getPatches "files/p3/patches" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" + br_version="2023.11.x" + getBuildroot "${br_version}" "br" echo "OK" @@ -86,8 +88,6 @@ jobs: sudo mount ${LOOPX}p1 "/tmp/p1" sudo mount ${LOOPX}p3 "/tmp/p3" - echo "Get Buildroot" - getBuildroot "2023.11.x" "br" [ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1 echo "Repack initrd" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78c50daa..d27f4b9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,6 +138,9 @@ jobs: getTheme "files/p1/boot/grub" echo "THEMETAG=${TAG}" >> $GITHUB_ENV getOffline "files/p3/configs" + echo "Get Buildroot" + br_version="2023.11.x" + getBuildroot "${br_version}" "br" echo "OK" @@ -160,9 +163,6 @@ jobs: sudo mount ${LOOPX}p1 "/tmp/p1" 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 echo "Repack initrd" diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index c7a7f389..da21df0e 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -137,7 +137,7 @@ jobs: echo "$(cat "${PRESET_CONFIG_FILE}")" echo "arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}" >"/tmp/automated" sudo cp -f "/tmp/automated" "/tmp/p3/automated" - echo "Copying files" + echo "Syncing files" sync echo "Unmount image file" diff --git a/Taskfile.yaml b/Taskfile.yaml index 9592c065..e3376727 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -5,6 +5,7 @@ version: "3" tasks: build-img: cmds: + - git pull - ./img-gen.sh compile-kpatch: diff --git a/img-gen.sh b/img-gen.sh index cf6fa217..0305b667 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -16,6 +16,7 @@ getConfigs "files/p3/configs" getPatches "files/p3/patches" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" +getBuildroot "2023.11.x" "br" IMAGE_FILE="arc.img" 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}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 VERSION=$(date +'%y.%-m.dev')