From 4dd1e400c4c181ddc662070c47adefd4f64eae56 Mon Sep 17 00:00:00 2001 From: j-hc <25510067+j-hc@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:27:28 +0300 Subject: [PATCH] improve changelog --- .github/workflows/build.yml | 16 +++++++--------- .github/workflows/ci.yml | 6 +++--- .gitignore | 2 +- build.sh | 7 +++---- utils.sh | 30 +++++++++++++++--------------- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e325d7c..ba643ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,8 +31,7 @@ jobs: - id: get_output run: | - echo -e "\n[revanced-magisk-module repo]($GITHUB_SERVER_URL/j-hc/revanced-magisk-module)" >>build.log - BUILD_LOG=$(cat build.log) + BUILD_LOG=$(cat build.md) echo "BUILD_LOG<> $GITHUB_ENV echo "$BUILD_LOG" >> $GITHUB_ENV @@ -42,7 +41,7 @@ jobs: yt_op=$(find . -maxdepth 1 -name "youtube-revanced-magisk-*.zip" -printf '%P') echo "YT_OUTPUT=$yt_op" >> $GITHUB_OUTPUT if [ -z "$yt_op" ]; then - echo "RELEASE_NAME="revanced"" >> $GITHUB_OUTPUT + echo "RELEASE_NAME="ReVanced"" >> $GITHUB_OUTPUT else echo "RELEASE_NAME=$yt_op" >> $GITHUB_OUTPUT fi @@ -66,8 +65,7 @@ jobs: - name: Update changelog and Magisk update jsons id: update_config run: | - cp -f build.log latest_build.md - CHANGELOG_URL="https://raw.githubusercontent.com/$GITHUB_REPOSITORY/update/latest_build.md" + CHANGELOG_URL="https://raw.githubusercontent.com/$GITHUB_REPOSITORY/update/build.md" get_update_json() { echo "{ \"version\": \"v$1\", @@ -77,21 +75,21 @@ jobs: }" } if [ -n "${{ steps.get_output.outputs.YT_OUTPUT }}" ]; then - YT_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*YouTube version: \(.*\)/\1/p') + YT_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*YouTube: \(.*\)/\1/p') YT_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.YT_OUTPUT }}" UPDATE_YT_JSON=$(get_update_json "$YT_VER" "${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}" "$YT_DLURL" "$CHANGELOG_URL") echo "$UPDATE_YT_JSON" >yt-update.json fi if [ -n "${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM64 }}" ]; then - MUSIC_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*Music (arm64-v8a) version: \(.*\)/\1/p') + MUSIC_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*Music (arm64-v8a): \(.*\)/\1/p') MUSIC_ARM64_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM64 }}" UPDATE_MUSIC_ARM64_JSON=$(get_update_json "$MUSIC_VER" "${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}" "$MUSIC_ARM64_DLURL" "$CHANGELOG_URL") echo "$UPDATE_MUSIC_ARM64_JSON" >music-update-arm64-v8a.json fi if [ -n "${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM }}" ]; then - MUSIC_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*Music (arm-v7a) version: \(.*\)/\1/p') + MUSIC_VER=$(echo "${{ env.BUILD_LOG }}" | sed -n 's/.*Music (arm-v7a): \(.*\)/\1/p') MUSIC_ARM_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM }}" UPDATE_MUSIC_ARM_JSON=$(get_update_json "$MUSIC_VER" "${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}" "$MUSIC_ARM_DLURL" "$CHANGELOG_URL") echo "$UPDATE_MUSIC_ARM_JSON" >music-update-arm-v7a.json @@ -102,5 +100,5 @@ jobs: with: branch: update skip_checkout: true - file_pattern: latest_build.md *.json + file_pattern: build.md *.json commit_message: Bump version ${{ steps.next_ver_code.outputs.NEXT_VER_CODE }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3cad62..eedeef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: is_youtube_latest() { if [[ $YT_PATCHER_ARGS == *"--experimental"* ]]; then - declare -r cur_yt=$(sed -n 's/.*YouTube version: \(.*\)/\1/p' latest_build.md | xargs) + declare -r cur_yt=$(sed -n 's/.*YouTube: \(.*\)/\1/p' build.md | xargs) [ -z "$cur_yt" ] && return 1 # empty, fail=>dont build declare -r last_ver=$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=youtube" | get_largest_ver) @@ -35,9 +35,9 @@ jobs: } is_patches_latest() { - declare -r last_patches_url=$(wget -nv -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | tr -d ' ' | sed -n 's/.*"browser_download_url":"\(.*jar\)".*/\1/p') + declare -r last_patches_url=$(wget -nv -O- https://api.github.com/repos/revanced/revanced-patches/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("jar"))') declare -r last_patches=${last_patches_url##*/} - cur_patches=$(sed -n 's/.*Patches: \(.*\)/\1/p' latest_build.md | xargs) + cur_patches=$(sed -n 's/.*Patches: \(.*\)/\1/p' build.md | xargs) echo "current patches version: $cur_patches" echo "latest patches version: $last_patches" diff --git a/.gitignore b/.gitignore index c063f4b..30a1651 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ /revanced-cache /temp /build -build.log +build.md /test diff --git a/build.sh b/build.sh index 82853f3..1b08ed7 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ if [ -z ${1+x} ]; then print_usage exit 0 elif [ "$1" = "clean" ]; then - rm -rf revanced-cache build.log build + rm -rf revanced-cache build.md build reset_template exit 0 elif [ "$1" = "reset-template" ]; then @@ -26,8 +26,7 @@ else exit 1 fi -: >build.log -log "$(date +'%Y-%m-%d')\n" +: >build.md mkdir -p "$BUILD_DIR" "$TEMP_DIR" if [ "$UPDATE_PREBUILTS" = true ]; then get_prebuilts; else set_prebuilts; fi @@ -47,10 +46,10 @@ if [ "$BUILD_MINDETACH_MODULE" = true ]; then : >detach.txt if [ "$BUILD_YT" = true ]; then echo "com.google.android.youtube" >>detach.txt; fi if [ "$BUILD_MUSIC_ARM64_V8A" = true ] || [ "$BUILD_MUSIC_ARM_V7A" = true ]; then echo "com.google.android.apps.youtube.music" >>detach.txt; fi - echo "com.google.android.apps.youtube.music" >>detach.txt zip -r ../../build/mindetach.zip . cd ../../ fi +log "\n[revanced-magisk-module](https://github.com/j-hc/revanced-magisk-module)" reset_template echo "Done" diff --git a/utils.sh b/utils.sh index c7b53c2..d630612 100755 --- a/utils.sh +++ b/utils.sh @@ -20,21 +20,22 @@ UNINSTALL_SH=$(cat $MODULE_SCRIPTS_DIR/uninstall.sh) get_prebuilts() { echo "Getting prebuilts" - RV_CLI_URL=$(req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | tr -d ' ' | sed -n 's/.*"browser_download_url":"\(.*jar\)".*/\1/p') + RV_CLI_URL=$(req https://api.github.com/repos/j-hc/revanced-cli/releases/latest - | jq -r '.assets[0].browser_download_url') RV_CLI_JAR="${TEMP_DIR}/${RV_CLI_URL##*/}" - log "CLI: ${RV_CLI_JAR#"$TEMP_DIR/"}" + log "CLI: ${RV_CLI_URL##*/}" - RV_INTEGRATIONS_URL=$(req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | tr -d ' ' | sed -n 's/.*"browser_download_url":"\(.*apk\)".*/\1/p') + RV_INTEGRATIONS_URL=$(req https://api.github.com/repos/revanced/revanced-integrations/releases/latest - | jq -r '.assets[0].browser_download_url') RV_INTEGRATIONS_APK=${RV_INTEGRATIONS_URL##*/} - RV_INTEGRATIONS_APK="${TEMP_DIR}/${RV_INTEGRATIONS_APK%.apk}-$(cut -d/ -f8 <<<"$RV_INTEGRATIONS_URL").apk" - log "Integrations: ${RV_INTEGRATIONS_APK#"$TEMP_DIR/"}" + 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_URL=$(req https://api.github.com/repos/revanced/revanced-patches/releases/latest - | tr -d ' ' | sed -n 's/.*"browser_download_url":"\(.*jar\)".*/\1/p') + RV_PATCHES=$(req https://api.github.com/repos/revanced/revanced-patches/releases/latest -) + RV_PATCHES_CHANGELOG=$(echo "$RV_PATCHES" | jq -r '.body' | sed '/^$/N;/^\n$/D') + RV_PATCHES_URL=$(echo "$RV_PATCHES" | jq -r '.assets[].browser_download_url | select(endswith("jar"))') RV_PATCHES_JAR="${TEMP_DIR}/${RV_PATCHES_URL##*/}" - local rv_patches_filename=${RV_PATCHES_JAR#"$TEMP_DIR/"} - local rv_patches_ver=${rv_patches_filename##*'-'} - log "Patches: $rv_patches_filename" - log "[Patches Changelog](https://github.com/revanced/revanced-patches/releases/tag/v${rv_patches_ver%%'.jar'*})" + log "Patches: ${RV_PATCHES_URL##*/}" + log "${RV_PATCHES_CHANGELOG//# [/### [}\n" dl_if_dne "$RV_CLI_JAR" "$RV_CLI_URL" dl_if_dne "$RV_INTEGRATIONS_APK" "$RV_INTEGRATIONS_URL" @@ -72,7 +73,7 @@ reset_template() { } req() { wget -nv -O "$2" --header="$WGET_HEADER" "$1"; } -log() { echo -e "$1 " >>build.log; } +log() { echo -e "$1 " >>build.md; } get_apk_vers() { req "https://www.apkmirror.com/uploads/?appcategory=${1}" - | sed -n 's;.*Version:\(.*\) .*;\1;p'; } get_largest_ver() { local max=0 @@ -136,8 +137,7 @@ build_rv() { local version reset_template - echo "Building ${args[app_name]} ${args[arch]}" - + echo "Building ${args[app_name]} (${args[arch]})" if [ "${args[is_module]}" = true ]; then if [[ ${args[patcher_args]} == *"--experimental"* ]]; then local select_ver_experimental=true @@ -178,9 +178,9 @@ build_rv() { "${args[regexp]}" \ "$stock_apk" if [ "${args[arch]}" = "all" ]; then - log "\n${args[app_name]} version: ${version}" + log "${args[app_name]}: ${version}" else - log "\n${args[app_name]} (${args[arch]}) version: ${version}" + log "${args[app_name]} (${args[arch]}): ${version}" fi fi