From ead589f49748b167c5b9cfae3fde3e04ebafe7b4 Mon Sep 17 00:00:00 2001 From: Macley <26381427+Macleykun@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:41:59 +0100 Subject: [PATCH 1/5] YEEEEEAAAAAW --- .github/workflows/buildapp.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index d1d94d1..fe920ac 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -113,6 +113,11 @@ jobs: (echo export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" >> ~/.bash_profile) source ~/.bash_profile cd ${{ github.workspace }}/main + # test + cat Tweaks/YTLite/Makefile + cat Tweaks/YTLite/Makefile | grep -i PACKAGE_VERSION + exit 1 + # test sed -i '' "12s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile sed -i '' "11s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile sed -i '' "s/^PACKAGE_VERSION.*$/PACKAGE_VERSION = ${{ env.YT_VERSION }}-${{ inputs.ytliteplus_version }}/" Makefile -- 2.45.2 From f132f83469218237f3f03a15e7c8e5fa67ddc6f5 Mon Sep 17 00:00:00 2001 From: Balackburn <93828569+Balackburn@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:52:58 +0100 Subject: [PATCH 2/5] Updated Assets --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 02c3b7a..5d6998a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@

- YTLitePlus Banner + YTLitePlus Banner

- +   - +   ![GitHub issues](https://img.shields.io/github/issues-raw/Balackburn/YTLitePlus?style=flat&labelColor=%23000000&color=%23000000) @@ -14,15 +14,15 @@ Badge # Table of Contents - + - + - + - + - + # Credits @@ -192,29 +192,29 @@ # AltStore - +   - +   - + # Donations - +   - + - +   - +   - +   - + # Building See [YTLitePlus/Building - Wiki](https://github.com/Balackburn/YTLitePlus/wiki/Building) -- 2.45.2 From e9f36f63325d6381116896b7685ff4df96c4e01b Mon Sep 17 00:00:00 2001 From: Macley <26381427+Macleykun@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:57:34 +0100 Subject: [PATCH 3/5] Bring her home :D --- .github/workflows/buildapp.yml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index fe920ac..8d8cfcd 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -11,11 +11,6 @@ on: default: "" required: true type: string - ytliteplus_version: - description: "The version of YTLitePlus" - default: "3.0.1" - required: true - type: string bundle_id: description: "Modify the bundle ID. Not recommended" default: "com.google.ios.youtube" @@ -103,6 +98,7 @@ jobs: 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 Tweaks/YTLite/Makefile | awk '{print $3}')" >> $GITHUB_ENV env: THEOS: ${{ github.workspace }}/theos YOUTUBE_URL: ${{ inputs.decrypted_youtube_url }} @@ -114,37 +110,34 @@ jobs: source ~/.bash_profile cd ${{ github.workspace }}/main # test - cat Tweaks/YTLite/Makefile - cat Tweaks/YTLite/Makefile | grep -i PACKAGE_VERSION - exit 1 + echo here it comes + echo "${{ env.YTLITE_VERSION }}" + echo that should be the version # test sed -i '' "12s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile sed -i '' "11s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile - sed -i '' "s/^PACKAGE_VERSION.*$/PACKAGE_VERSION = ${{ env.YT_VERSION }}-${{ inputs.ytliteplus_version }}/" Makefile + sed -i '' "s/^PACKAGE_VERSION.*$/PACKAGE_VERSION = ${{ env.YT_VERSION }}-${{ env.YTLITE_VERSION }}/" Makefile make package FINALPACKAGE=1 - (mv "packages/$(ls -t packages | head -n1)" "packages/YTLitePlus_${{ env.YT_VERSION }}_${{ env.ytliteplus_version }}.ipa") + (mv "packages/$(ls -t packages | head -n1)" "packages/YTLitePlus_${{ env.YT_VERSION }}_${{ env.YTLITE_VERSION }}.ipa") echo "package=$(ls -t packages | head -n1)" >>$GITHUB_OUTPUT echo -e "==> \033[1mSHASUM256: $(shasum -a 256 packages/*.ipa | cut -f1 -d' ')\033[0m" echo -e "==> \033[1mBundle ID: ${{ env.BUNDLE_ID }}\033[0m" env: THEOS: ${{ github.workspace }}/theos - ytliteplus_version: ${{ inputs.ytliteplus_version }} BUNDLE_ID: ${{ inputs.bundle_id }} APP_NAME: ${{ inputs.app_name }} - name: Upload Artifact uses: actions/upload-artifact@v4.3.1 - env: - ytliteplus_version: ${{ inputs.ytliteplus_version }} with: - name: YTLitePlus_${{ env.YT_VERSION }}_${{ env.ytliteplus_version }} + name: YTLitePlus_${{ env.YT_VERSION }}_${{ env.YTLITE_VERSION }} path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }} if-no-files-found: error - name: Prepare Release Notes run: | export TODAY=$(date '+%Y-%m-%d') - sed "s/%ytliteplus_version%/${{ inputs.ytliteplus_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" \ main/.github/RELEASE_TEMPLATE/Release.md > ${{ github.workspace }}/release_notes.md - name: Create Release @@ -152,11 +145,10 @@ jobs: uses: softprops/action-gh-release@v2.0.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ytliteplus_version: ${{ inputs.ytliteplus_version }} DRAFT: ${{ inputs.create_release }} with: - tag_name: v${{ env.YT_VERSION }}-${{ env.ytliteplus_version }} - name: v${{ env.YT_VERSION }}-${{ env.ytliteplus_version }} - YTLitePlus + tag_name: v${{ env.YT_VERSION }}-${{ env.YTLITE_VERSION }} + name: v${{ env.YT_VERSION }}-${{ env.YTLITE_VERSION }} - YTLitePlus files: main/packages/*.ipa draft: ${{ env.DRAFT }} body_path: ${{ github.workspace }}/release_notes.md -- 2.45.2 From 574690c07551e1a0c5bd61d77916ac60c4d55292 Mon Sep 17 00:00:00 2001 From: Macley <26381427+Macleykun@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:01:50 +0100 Subject: [PATCH 4/5] specify correct full path for fetching ytlite ver --- .github/workflows/buildapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index 8d8cfcd..bc46e7e 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -98,7 +98,7 @@ jobs: 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 Tweaks/YTLite/Makefile | awk '{print $3}')" >> $GITHUB_ENV + echo "YTLITE_VERSION=$(grep ^PACKAGE_VERSION ${{ github.workspace }}/main/Tweaks/YTLite/Makefile | awk '{print $3}')" >> $GITHUB_ENV env: THEOS: ${{ github.workspace }}/theos YOUTUBE_URL: ${{ inputs.decrypted_youtube_url }} -- 2.45.2 From b96b5bcd25f2aede57f653154872d619870d262d Mon Sep 17 00:00:00 2001 From: Macley <26381427+Macleykun@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:21:54 +0100 Subject: [PATCH 5/5] Update buildapp.yml --- .github/workflows/buildapp.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index bc46e7e..6138c2f 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -109,11 +109,6 @@ jobs: (echo export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" >> ~/.bash_profile) source ~/.bash_profile cd ${{ github.workspace }}/main - # test - echo here it comes - echo "${{ env.YTLITE_VERSION }}" - echo that should be the version - # test sed -i '' "12s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile sed -i '' "11s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile sed -i '' "s/^PACKAGE_VERSION.*$/PACKAGE_VERSION = ${{ env.YT_VERSION }}-${{ env.YTLITE_VERSION }}/" Makefile -- 2.45.2