From 623271fc6c91196c04dbdb39a70290114d57651d Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sat, 9 Nov 2024 12:22:54 +0100 Subject: [PATCH] build: include dependencies in release Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 21 +++++++++++++++++++++ .github/workflows/build.yml | 21 +++++++++++++++++++++ scripts/func.sh | 9 +++++++++ 3 files changed, 51 insertions(+) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 5b91036c..c9a031f2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -60,6 +60,16 @@ jobs: getBuildrootx "brx" getBuildroots "brs" + # Export Dependencies Version to env + echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV + echo "MODULETAG=${MODULETAG}" >> $GITHUB_ENV + echo "CONFIGTAG=${CONFIGTAG}" >> $GITHUB_ENV + echo "PATCHTAG=${PATCHTAG}" >> $GITHUB_ENV + echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV + echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV + echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV + echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV + echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" @@ -218,6 +228,17 @@ jobs: Full Changelog and Arc Patch (Decryption Key) are available in my Discord. + ### Dependencies: + - Addons: ${{ env.ADDONTAG }} + - Modules: ${{ env.MODULETAG }} + - Configs: ${{ env.CONFIGTAG }} + - Patches: ${{ env.PATCHTAG }} + - Custom: ${{ env.CUSTOMTAG }} + - LKMs: ${{ env.LKMTAG }} + - Theme: ${{ env.THEMETAG }} + - Buildroot Next: ${{ env.BRXTAG }} + - Buildroot Stable: ${{ env.BRSTAG }} + ### Release ${{ env.BUILD_TIME }} artifacts: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1ab468b..26c9b41e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,6 +87,16 @@ jobs: getBuildrootx "brx" getBuildroots "brs" + # Export Dependencies Version to env + echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV + echo "MODULETAG=${MODULETAG}" >> $GITHUB_ENV + echo "CONFIGTAG=${CONFIGTAG}" >> $GITHUB_ENV + echo "PATCHTAG=${PATCHTAG}" >> $GITHUB_ENV + echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV + echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV + echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV + echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV + echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV echo "OK" @@ -259,6 +269,17 @@ jobs: - stable: Stable Image (Full Image, all dependencies are included, less hardware support) - next: Next Image (Full Image, all dependencies are included, more hardware support, new features to test) + ### Dependencies: + - Addons: ${{ env.ADDONTAG }} + - Modules: ${{ env.MODULETAG }} + - Configs: ${{ env.CONFIGTAG }} + - Patches: ${{ env.PATCHTAG }} + - Custom: ${{ env.CUSTOMTAG }} + - LKMs: ${{ env.LKMTAG }} + - Theme: ${{ env.THEMETAG }} + - Buildroot Next: ${{ env.BRXTAG }} + - Buildroot Stable: ${{ env.BRSTAG }} + ### Release ${{ env.BUILD_TIME }} artifacts: | diff --git a/scripts/func.sh b/scripts/func.sh index 672d364f..814fd648 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -39,6 +39,7 @@ function getLKMs() { local CACHE_FILE="/tmp/rp-lkms.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")')" + export LKMTAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-lkm/releases/download/${TAG}/rp-lkms.zip" -o "${CACHE_FILE}"; then # Unzip LKMs rm -rf "${DEST_PATH}" @@ -60,6 +61,7 @@ function getAddons() { local CACHE_DIR="/tmp/addons" local CACHE_FILE="/tmp/addons.zip" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-addons/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export ADDONTAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-addons/releases/download/${TAG}/addons-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Addons rm -rf "${CACHE_DIR}" @@ -90,6 +92,7 @@ function getModules() { local CACHE_FILE="/tmp/modules.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-modules/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export MODULETAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Modules rm -rf "${DEST_PATH}" @@ -110,6 +113,7 @@ function getConfigs() { local CACHE_FILE="/tmp/configs.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-configs/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export CONFIGTAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Configs rm -rf "${DEST_PATH}" @@ -131,6 +135,7 @@ function getPatches() { local CACHE_FILE="/tmp/patches.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-patches/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export PATCHTAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-patches/releases/download/${TAG}/patches-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Patches rm -rf "${DEST_PATH}" @@ -152,6 +157,7 @@ function getCustom() { local CACHE_FILE="/tmp/custom.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-custom/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export CUSTOMTAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-custom/releases/download/${TAG}/custom-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Custom rm -rf "${DEST_PATH}" @@ -173,6 +179,7 @@ function getTheme() { local CACHE_FILE="/tmp/theme.zip" rm -f "${CACHE_FILE}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-theme/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export THEMETAG="${TAG}" if curl -skL "https://github.com/AuxXxilium/arc-theme/releases/download/${TAG}/arc-theme-${TAG}.zip" -o "${CACHE_FILE}"; then # Unzip Theme mkdir -p "${DEST_PATH}" @@ -192,6 +199,7 @@ function getBuildrootx() { local DEST_PATH="${1}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export BRXTAG="${TAG}" [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}" echo "Getting Kernel" rm -f "${DEST_PATH}/bzImage-arc" @@ -218,6 +226,7 @@ function getBuildroots() { local DEST_PATH="${1}" TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + export BRSTAG="${TAG}" [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}" echo "Getting Kernel" rm -f "${DEST_PATH}/bzImage-arc"