From 2489260fba50e9a1b9460ef0c7b1064cc0b79ddc Mon Sep 17 00:00:00 2001 From: j-hc <25510067+j-hc@users.noreply.github.com> Date: Sun, 1 Jan 2023 22:38:20 +0300 Subject: [PATCH] fix rate limit for github requests --- .github/workflows/ci.yml | 2 +- utils.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab392f4..9f76097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: } is_patches_latest() { - declare -r last_patches_url=$(wget -nv -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | json_get 'browser_download_url' | grep 'jar') + declare -r last_patches_url=$(wget -nv --header="Authorization: token ${{ secrets.GITHUB_TOKEN }}" -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | json_get 'browser_download_url' | grep 'jar') declare -r last_patches=${last_patches_url##*/} cur_patches=$(sed -n 's/.*Patches: \(.*\)/\1/p' build.md | xargs) diff --git a/utils.sh b/utils.sh index 325ae17..92fd5bd 100755 --- a/utils.sh +++ b/utils.sh @@ -6,8 +6,13 @@ MODULE_TEMPLATE_DIR="revanced-magisk" MODULE_SCRIPTS_DIR="scripts" TEMP_DIR="temp" BUILD_DIR="build" -PKGS_LIST="temp/module-pkgs" +PKGS_LIST="${TEMP_DIR}/module-pkgs" +if [ "${GITHUB_TOKEN+x}" ]; then + GH_AUTH_HEADER="Authorization: token ${GITHUB_TOKEN}" +else + GH_AUTH_HEADER="" +fi GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-$"j-hc/revanced-magisk-module"} NEXT_VER_CODE=${NEXT_VER_CODE:-$(date +'%Y%m%d')} WGET_HEADER="User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Firefox/108.0" @@ -45,17 +50,17 @@ read_main_config() { get_prebuilts() { echo "Getting prebuilts" - RV_CLI_URL=$(req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | json_get 'browser_download_url') + RV_CLI_URL=$(gh_req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | json_get 'browser_download_url') RV_CLI_JAR="${TEMP_DIR}/${RV_CLI_URL##*/}" log "CLI: ${RV_CLI_URL##*/}" - RV_INTEGRATIONS_URL=$(req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | json_get 'browser_download_url') + RV_INTEGRATIONS_URL=$(gh_req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | json_get 'browser_download_url') RV_INTEGRATIONS_APK=${RV_INTEGRATIONS_URL##*/} RV_INTEGRATIONS_APK="${RV_INTEGRATIONS_APK%.apk}-$(cut -d/ -f8 <<<"$RV_INTEGRATIONS_URL").apk" log "Integrations: $RV_INTEGRATIONS_APK" RV_INTEGRATIONS_APK="${TEMP_DIR}/${RV_INTEGRATIONS_APK}" - RV_PATCHES=$(req https://api.github.com/repos/revanced/revanced-patches/releases/latest -) + RV_PATCHES=$(gh_req https://api.github.com/repos/revanced/revanced-patches/releases/latest -) RV_PATCHES_CHANGELOG=$(echo "$RV_PATCHES" | json_get 'body' | sed 's/\(\\n\)\+/\\n/g') RV_PATCHES_URL=$(echo "$RV_PATCHES" | json_get 'browser_download_url' | grep 'jar') RV_PATCHES_JAR="${TEMP_DIR}/${RV_PATCHES_URL##*/}" @@ -88,6 +93,7 @@ set_prebuilts() { } req() { wget -nv -O "$2" --header="$WGET_HEADER" "$1"; } +gh_req() { wget -nv -O "$2" --header="$GH_AUTH_HEADER" "$1"; } log() { echo -e "$1 " >>build.md; } get_largest_ver() { local max=0