From ded048d0c66fe9e1824a3ae98d2773132799e1e4 Mon Sep 17 00:00:00 2001
From: arichornlover <78001398+arichornlover@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:25:15 -0600
Subject: [PATCH] Improved v16.42.3 Building

v16.42.3 is now in Parody with the Main Branch of uYouEnhanced!
Also I removed the uYouPlusExtra name from this new release!
---
 .github/workflows/buildapp.yml | 67 +++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml
index a705e69..809ff40 100644
--- a/.github/workflows/buildapp.yml
+++ b/.github/workflows/buildapp.yml
@@ -1,11 +1,21 @@
 # Original idea by @ISnackable. Thanks to him for handling the hardest parts!
 # https://github.com/ISnackable/YTCubePlus/blob/main/.github/workflows/Build.yml
 
-name: Build and Release uYouPlusExtra (v16.42.3-2.1 LTS)
+name: Build and Release uYouEnhanced (v16.42.3-2.1 LTS)
 
 on:
   workflow_dispatch:
     inputs:
+      sdk_version:
+        description: "iOS SDK version to be used during build"
+        default: "16.2"
+        required: true
+        type: string
+      youtube_version:
+        description: "The version of YouTube"
+        default: ""
+        required: true
+        type: string
       uyou_version:
         description: "The version of uYou"
         default: "2.1"
@@ -16,11 +26,6 @@ on:
         default: ""
         required: true
         type: string
-      youtube_version:
-        description: "The version of YouTube"
-        default: ""
-        required: true
-        type: string
       bundle_id:
         description: "Modify the bundle ID. Not recommended"
         default: "com.google.ios.youtube"
@@ -36,6 +41,11 @@ on:
         default: true
         required: false
         type: boolean
+      upload_artifact:
+        description: "Upload Artifact"
+        default: true
+        required: false
+        type: boolean
   
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -43,51 +53,55 @@ concurrency:
 
 jobs:
   build:
-    name: Build uYouPlus
+    name: Build uYouEnhanced
     runs-on: macos-latest
     permissions:
       contents: write
 
     steps:
+      - name: Install Dependencies
+        run: brew install curl dpkg jq ldid make node svn wget xz
+
+      - name: Set PATH environment variable
+        run: echo "$(brew --prefix make)/libexec/gnubin" >> $GITHUB_PATH
+
       - name: Checkout Main
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
         with:
           path: main
           submodules: recursive
 
-      - name: Install Dependencies
-        run: brew install ldid dpkg make
-
-      - name: Set PATH environment variable
-        run: echo "$(brew --prefix make)/libexec/gnubin" >> $GITHUB_PATH 
-
       - name: Setup Theos
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: theos/theos
-          ref: 3da31488281ecf4394d10302d2629607f4a1aa07
+          ref: master
           path: theos
           submodules: recursive
       
-      - name: Caching
+      - name: SDK Caching
         id: SDK
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4.0.0
         env:
-          cache-name: iOS-16.2-SDK
+          cache-name: iOS-${{ inputs.sdk_version }}-SDK
         with:
           path: theos/sdks/
           key: ${{ env.cache-name }}
-      
-      - name: Download iOS 16.2 SDK
+          restore-keys: ${{ env.cache-name }}
+
+      - name: Download iOS SDK
         if: steps.SDK.outputs.cache-hit != 'true'
         run: |
-          svn checkout -q https://github.com/arichorn/sdks/trunk/iPhoneOS16.2.sdk
+          git clone --quiet -n --depth=1 --filter=tree:0 https://github.com/arichorn/sdks/
+          cd sdks
+          git sparse-checkout set --no-cone iPhoneOS${{ inputs.sdk_version }}.sdk
+          git checkout
           mv *.sdk $THEOS/sdks
         env:
           THEOS: ${{ github.workspace }}/theos
 
       - name: Setup Theos Jailed
-        uses: actions/checkout@v3.6.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: qnblackcat/theos-jailed
           ref: master
@@ -123,7 +137,7 @@ jobs:
           sed -i '' "12s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile
           sed -i '' "11s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile          
           make package FINALPACKAGE=1
-          (mv "packages/$(ls -t packages | head -n1)" "packages/uYouPlusExtra_${{ env.YOUTUBE_VERSION  }}_${{ env.UYOU_VERSION }}.ipa")
+          (mv "packages/$(ls -t packages | head -n1)" "packages/uYouEnhanced_${{ env.YOUTUBE_VERSION  }}_${{ env.UYOU_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"
@@ -136,12 +150,13 @@ jobs:
           APP_NAME: ${{ inputs.app_name }}
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3.1.2
+        if: ${{ inputs.upload_artifact }}
+        uses: actions/upload-artifact@v4.3.0
         env:
           UYOU_VERSION: ${{ inputs.uyou_version }}
           YOUTUBE_VERSION: ${{ inputs.youtube_version }}
         with:
-          name: uYouPlusExtra_${{ env.YOUTUBE_VERSION }}_${{ env.UYOU_VERSION }}
+          name: uYouEnhanced_${{ env.YOUTUBE_VERSION }}_${{ env.UYOU_VERSION }}
           path: ${{ github.workspace }}/main/packages/${{ steps.build_package.outputs.package }}
           if-no-files-found: error