From 65fc9892f50f1ad6d88c834362435cc79f0e309c Mon Sep 17 00:00:00 2001 From: Balackburn Date: Mon, 10 Jun 2024 18:23:38 +0200 Subject: [PATCH] Added catbox.moe artifact upload --- .github/RELEASE_TEMPLATE/Release.md | 3 +++ .github/workflows/buildapp.yml | 16 +++++++++++----- Makefile | 9 +++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/RELEASE_TEMPLATE/Release.md b/.github/RELEASE_TEMPLATE/Release.md index 6af941e..c57df3a 100644 --- a/.github/RELEASE_TEMPLATE/Release.md +++ b/.github/RELEASE_TEMPLATE/Release.md @@ -16,3 +16,6 @@ Current App Compatibility: `iOS/iPadOS 15.0` or later ### Issues in this Release: - LowContrastMode does not work *(Compatible only with YouTube v17.33.2-v17.38.10)* - Hiding Shorts creates an empty space instead #55 + +### Catbox +%catbox_url% \ No newline at end of file diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index bac714e..499a5a1 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -104,13 +104,11 @@ jobs: wget "$YOUTUBE_URL" --no-verbose -O main/YouTube.ipa unzip -q main/YouTube.ipa -d main/tmp echo "YT_VERSION=$(grep -A 1 'CFBundleVersion' main/tmp/Payload/YouTube.app/Info.plist | grep '' | awk -F'[><]' '{print $3}')" >> $GITHUB_ENV + YTLITE_VERSION=$(make -s -f ${{ github.workspace }}/main/Makefile print-version) + echo "YTLITE_VERSION=$YTLITE_VERSION" >> $GITHUB_ENV rm -rf main/tmp/Payload/YouTube.app/_CodeSignature/CodeResources rm -rf main/tmp/Payload/YouTube.app/PlugIns/* cp -R main/Extensions/*.appex main/tmp/Payload/YouTube.app/PlugIns - echo "YTLITE_VERSION=$(grep ^PACKAGE_VERSION ${{ github.workspace }}/main/Tweaks/YTLite/Makefile | awk '{print $3}')" >> $GITHUB_ENV - LATEST_RELEASE=$(curl -s "https://api.github.com/repos/dayanch96/YTLite/releases/latest" | jq -r ".tag_name") - YTLITE_VERSION=$(echo "$LATEST_RELEASE" | sed 's/v//') - echo "YTLITE_VERSION=$YTLITE_VERSION" >> $GITHUB_ENV env: THEOS: ${{ github.workspace }}/theos YOUTUBE_URL: ${{ inputs.decrypted_youtube_url }} @@ -140,11 +138,19 @@ jobs: name: YTLitePlus_${{ env.YT_VERSION }}_${{ env.YTLITE_VERSION }} path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }} if-no-files-found: error + + - name: Upload Artifact to Catbox + run: | + RESPONSE=$(curl -F "reqtype=fileupload" -F "fileToUpload=@${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }}" https://catbox.moe/user/api.php) + CATBOX_URL=$(echo $RESPONSE | grep -o -E 'https://files.catbox.moe/[^"]*') + echo "Uploaded artifact to $CATBOX_URL" + CATBOX_FILE=$(echo $CATBOX_URL | sed 's|https://files.catbox.moe||') + echo "CATBOX_FILE=$CATBOX_FILE" >> $GITHUB_ENV - name: Prepare Release Notes run: | export TODAY=$(date '+%Y-%m-%d') - sed "s/%ytliteplus_version%/${{ env.YTLITE_VERSION }}/g; s/%youtube_version%/${{ env.YT_VERSION }}/g; s/%date%/$TODAY/g" \ + sed "s/%ytliteplus_version%/${{ env.YTLITE_VERSION }}/g; s/%youtube_version%/${{ env.YT_VERSION }}/g; s/%date%/$TODAY/g; s/%catbox_url%//${{ env.CATBOX_FILE }}/g" \ main/.github/RELEASE_TEMPLATE/Release.md > ${{ github.workspace }}/release_notes.md - name: Create Release diff --git a/Makefile b/Makefile index df5f81f..7c6de9c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ MODULES = jailed FINALPACKAGE = 1 CODESIGN_IPA = 0 PACKAGE_VERSION = X.X.X-X.X -YTLITE_VERSION = 4.0 TWEAK_NAME = YTLitePlus DISPLAY_NAME = YouTube @@ -25,10 +24,15 @@ SUBPROJECTS += Tweaks/Alderis Tweaks/iSponsorBlock Tweaks/YTUHD Tweaks/YouPiP Tw include $(THEOS_MAKE_PATH)/aggregate.mk YTLITE_PATH = Tweaks/YTLite +YTLITE_VERSION := $(shell curl -s "https://api.github.com/repos/dayanch96/YTLite/releases/latest" | jq -r ".tag_name" | sed 's/v//') +export YTLITE_VERSION + +print-version: + @echo $(YTLITE_VERSION) + YTLITE_DEB = $(YTLITE_PATH)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb YTLITE_DYLIB = $(YTLITE_PATH)/var/jb/Library/MobileSubstrate/DynamicLibraries/YTLite.dylib YTLITE_BUNDLE = $(YTLITE_PATH)/var/jb/Library/Application\ Support/YTLite.bundle - before-package:: @echo -e "==> \033[1mMoving tweak's bundle to Resources/...\033[0m" @mkdir -p Resources/Frameworks/Alderis.framework && find .theos/obj/install/Library/Frameworks/Alderis.framework -maxdepth 1 -type f -exec cp {} Resources/Frameworks/Alderis.framework/ \; @@ -55,6 +59,7 @@ before-all:: @if [[ ! -f $(YTLITE_DEB) ]]; then \ rm -rf $(YTLITE_PATH)/*; \ $(PRINT_FORMAT_BLUE) "Downloading YTLite"; \ + echo "YTLITE_VERSION: $(YTLITE_VERSION)"; \ curl -s -L "https://github.com/dayanch96/YTLite/releases/download/v$(YTLITE_VERSION)/com.dvntm.ytlite_$(YTLITE_VERSION)_iphoneos-arm64.deb" -o $(YTLITE_DEB); \ tar -xf $(YTLITE_DEB) -C $(YTLITE_PATH); tar -xf $(YTLITE_PATH)/data.tar* -C $(YTLITE_PATH); \ if [[ ! -f $(YTLITE_DYLIB) || ! -d $(YTLITE_BUNDLE) ]]; then \