From 7dddfe463c6b1ccaa3189798cce2e2b484c1868b Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 2 Aug 2024 18:28:15 +0200 Subject: [PATCH] build: load custom from it's own repo Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 13 +++++++++++-- .github/workflows/build.yml | 5 ++++- img-gen.sh | 1 + scripts/func.sh | 23 +++++++++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index c6cd7964..fc1945ee 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -58,20 +58,28 @@ jobs: . scripts/func.sh getLKMs "files/p3/lkms" + echo "LKMTAG=${TAG}" >> $GITHUB_ENV getAddons "files/p3/addons" + echo "ADDONSTAG=${TAG}" >> $GITHUB_ENV getModules "files/p3/modules" + echo "MODULESTAG=${TAG}" >> $GITHUB_ENV getConfigs "files/p3/configs" + echo "CONFIGSTAG=${TAG}" >> $GITHUB_ENV getPatches "files/p3/patches" + echo "PATCHESTAG=${TAG}" >> $GITHUB_ENV + getCustom "files/p3/custom" + echo "CUSTOMTAG=${TAG}" >> $GITHUB_ENV getTheme "files/p1/boot/grub" + echo "THEMETAG=${TAG}" >> $GITHUB_ENV getOffline "files/p3/configs" getBuildroot "latest" "br" - echo "BR_XVERSION=${TAG}" >> $GITHUB_ENV + echo "BR_VERSION=${TAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" # Build incremental - - name: Build Image X + - name: Build Image run: | . scripts/func.sh @@ -161,6 +169,7 @@ jobs: Configs: ${{ env.CONFIGSTAG }} Modules: ${{ env.MODULESTAG }} Patches: ${{ env.PATCHESTAG }} + Custom: ${{ env.CUSTOMTAG }} Theme: ${{ env.THEMETAG }} LKM: ${{ env.LKMTAG }} Buildroot: ${{ env.BR_XVERSION }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9bae43a..15c9d361 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,6 +102,8 @@ jobs: echo "CONFIGSTAG=${TAG}" >> $GITHUB_ENV getPatches "files/p3/patches" echo "PATCHESTAG=${TAG}" >> $GITHUB_ENV + getCustom "files/p3/custom" + echo "CUSTOMTAG=${TAG}" >> $GITHUB_ENV getTheme "files/p1/boot/grub" echo "THEMETAG=${TAG}" >> $GITHUB_ENV getOffline "files/p3/configs" @@ -112,7 +114,7 @@ jobs: echo "OK" # Build incremental - - name: Build Image X + - name: Build Image run: | . scripts/func.sh @@ -195,6 +197,7 @@ jobs: Configs: ${{ env.CONFIGSTAG }} Modules: ${{ env.MODULESTAG }} Patches: ${{ env.PATCHESTAG }} + Custom: ${{ env.CUSTOMTAG }} Theme: ${{ env.THEMETAG }} LKM: ${{ env.LKMTAG }} Buildroot: ${{ env.BR_XVERSION }} diff --git a/img-gen.sh b/img-gen.sh index 6b7dd6e7..e6ebf8d9 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -13,6 +13,7 @@ getAddons "files/p3/addons" getModules "files/p3/modules" getConfigs "files/p3/configs" getPatches "files/p3/patches" +getCustom "files/p3/custom" getTheme "files/p1/boot/grub" getOffline "files/p3/configs" getBuildroot "latest" "br" diff --git a/scripts/func.sh b/scripts/func.sh index 460ca363..e5973eaf 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -176,6 +176,29 @@ function getPatches() { echo "Getting Patches end - ${TAG}" } +# Get latest Custom +# $1 path +function getCustom() { + echo "Getting Custom begin" + local DEST_PATH="${1:-custom}" + local CACHE_FILE="/tmp/custom.zip" + rm -f "${CACHE_FILE}" + if [ -n "${CUSTOMTAG}" ]; then + TAG="${CUSTOMTAG}" + else + TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-custom/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + fi + STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/arc-custom/releases/download/${TAG}/custom.zip" -o "${CACHE_FILE}") + echo "TAG=${TAG}; Status=${STATUS}" + [ ${STATUS} -ne 200 ] && exit 1 + # Unzip Custom + rm -rf "${DEST_PATH}" + mkdir -p "${DEST_PATH}" + unzip "${CACHE_FILE}" -d "${DEST_PATH}" + rm -f "${CACHE_FILE}" + echo "Getting Custom end - ${TAG}" +} + # Get latest Theme # $1 path function getTheme() {