From cbd30c7c8fd0a8854d277eeb63d03815485b4dff Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 5 Apr 2024 13:57:30 +0200 Subject: [PATCH] Revert "build: update" This reverts commit 21ada277c25c9965349d4fac66143e27ba1db39d. --- .github/workflows/autobuild.yml | 2 +- .github/workflows/build.yml | 10 +++++----- img-gen.sh | 5 +---- scripts/func.sh | 5 ++--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2cd22f55..190ba44d 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -61,7 +61,7 @@ jobs: getLKMs "files/p3/lkms" getAddons "files/p3/addons" getModules "files/p3/modules" - getConfigs "files/p3/configs" "${{ secrets.ACTION }}" + getConfigs "files/p3/configs" getPatches "files/p3/patches" echo "OK" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6be32b69..a09274fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,19 +121,19 @@ jobs: getExtractor "files/p3/extractor" LKMTAG="${{ inputs.lkm_version }}" - getLKMs "files/p3/lkms" + getLKMs "files/p3/lkms" ${{ inputs.prerelease }} echo "LKMTAG=${TAG}" >> $GITHUB_ENV ADDONSTAG="${{ inputs.addons_version }}" - getAddons "files/p3/addons" + getAddons "files/p3/addons" ${{ inputs.prerelease }} echo "ADDONSTAG=${TAG}" >> $GITHUB_ENV MODULESTAG="${{ inputs.modules_version }}" - getModules "files/p3/modules" + getModules "files/p3/modules" ${{ inputs.prerelease }} echo "MODULESTAG=${TAG}" >> $GITHUB_ENV CONFIGSTAG="${{ inputs.configs_version }}" - getConfigs "files/p3/configs" "${{ secrets.ACTION }}" + getConfigs "files/p3/configs" ${{ inputs.prerelease }} echo "CONFIGSTAG=${TAG}" >> $GITHUB_ENV PATCHESTAG="${{ inputs.patches_version }}" - getPatches "files/p3/patches" + getPatches "files/p3/patches" ${{ inputs.prerelease }} echo "PATCHESTAG=${TAG}" >> $GITHUB_ENV echo "OK" diff --git a/img-gen.sh b/img-gen.sh index 8cf4c982..c9f4f6e5 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -8,15 +8,12 @@ set -e sudo git clean -fdx sudo git pull -# Get Github Key -KEY="$(cat ../key)" - # Get extractor, LKM, addons and Modules getExtractor "files/p3/extractor" getLKMs "files/p3/lkms" getAddons "files/p3/addons" getModules "files/p3/modules" -getConfigs "files/p3/configs" "${KEY}" +getConfigs "files/p3/configs" getPatches "files/p3/patches" IMAGE_FILE="arc.img" diff --git a/scripts/func.sh b/scripts/func.sh index afad829b..be4f3613 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -136,14 +136,13 @@ function getConfigs() { echo "Getting Configs begin" local DEST_PATH="${1:-configs}" local CACHE_FILE="/tmp/configs.zip" - local KEY="${2:-${{ secrets.ACTION }}}" rm -f "${CACHE_FILE}" if [ -n "${CONFIGSTAG}" ]; then TAG="${CONFIGSTAG}" else - TAG="$(curl -s https://oauth2:${KEY}@api.github.com/repos/AuxXxilium/arc-configs/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')" + 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://oauth2:${KEY}@github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs.zip" -o "${CACHE_FILE}") + 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 # Unzip Modules