diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 589ea809..af1e3ade 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,26 @@ on: description: "buildroot version" default: "2023.02.x" type: string + addons_version: + description: "addons version" + default: "24.x.x" + type: string + configs_version: + description: "configs version" + default: "24.x.x" + type: string + modules_version: + description: "modules version" + default: "24.x.x" + type: string + lkm_version: + description: "lkm version" + default: "24.x.x" + type: string + patches_version: + description: "patches version" + default: "24.x.x" + type: string jobs: build: @@ -97,11 +117,21 @@ jobs: . scripts/func.sh getExtractor "files/p3/extractor" + LKMTAG="${{ inputs.lkm_version }}" getLKMs "files/p3/lkms" ${{ inputs.prerelease }} + echo "LKMTAG=${TAG}" >> $GITHUB_ENV + ADDONSTAG="${{ inputs.addons_version }}" getAddons "files/p3/addons" ${{ inputs.prerelease }} + echo "ADDONSTAG=${TAG}" >> $GITHUB_ENV + MODULESTAG="${{ inputs.modules_version }}" getModules "files/p3/modules" ${{ inputs.prerelease }} + echo "MODULESTAG=${TAG}" >> $GITHUB_ENV + CONFIGSTAG="${{ inputs.configs_version }}" getConfigs "files/p3/configs" ${{ inputs.prerelease }} + echo "CONFIGSTAG=${TAG}" >> $GITHUB_ENV + PATCHESTAG="${{ inputs.patches_version }}" getPatches "files/p3/patches" ${{ inputs.prerelease }} + echo "PATCHESTAG=${TAG}" >> $GITHUB_ENV echo "OK" @@ -191,6 +221,12 @@ jobs: tag_name: ${{ env.VERSION }} prerelease: ${{ inputs.prerelease }} body: | + Buildroot: ${{ inputs.br_version }} + Addons: ${{ env.ADDONSTAG }} + Configs: ${{ env.CONFIGSTAG }} + Modules: ${{ env.MODULESTAG }} + Patches: ${{ env.PATCHESTAG }} + LKM: ${{ env.LKMTAG }} ${{ steps.Changelog.outputs.changelog }} files: | arc-${{ env.VERSION }}.img.zip diff --git a/scripts/func.sh b/scripts/func.sh index 6c49acc6..14df9361 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -58,7 +58,11 @@ function getLKMs() { local DEST_PATH="${1:-lkms}" local CACHE_FILE="/tmp/rp-lkms.zip" rm -f "${CACHE_FILE}" - TAG="$(curl -s "https://api.github.com/repos/AuxXxilium/redpill-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")')" + if [ -n "${LKMTAG}" ]; then + TAG="${LKMTAG}" + else + TAG="$(curl -s "https://api.github.com/repos/AuxXxilium/redpill-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")')" + fi STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 @@ -77,7 +81,11 @@ function getAddons() { local DEST_PATH="${1:-addons}" 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(.*)(?=")')" + if [ -n "${ADDONSTAG}" ]; then + TAG="${ADDONSTAG}" + else + TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-addons/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + fi STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/arc-addons/releases/download/${TAG}/addons.zip" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 @@ -105,7 +113,11 @@ function getModules() { local DEST_PATH="${1:-modules}" 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(.*)(?=")')" + if [ -n "${MODULESTAG}" ]; then + TAG="${MODULESTAG}" + else + TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-modules/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + fi STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules.zip" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 @@ -124,7 +136,11 @@ function getConfigs() { local DEST_PATH="${1:-configs}" 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(.*)(?=")')" + if [ -n "${CONFIGSTAG}" ]; then + TAG="${CONFIGSTAG}" + else + TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-configs/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + fi STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs.zip" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 @@ -143,7 +159,11 @@ function getPatches() { local DEST_PATH="${1:-patches}" 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(.*)(?=")')" + if [ -n "${PATCHESTAG}" ]; then + TAG="${PATCHESTAG}" + else + TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-patches/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + fi STATUS=$(curl -w "%{http_code}" -L "https://github.com/AuxXxilium/arc-patches/releases/download/${TAG}/patches.zip" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1