From dbae9099e5518aaf124bc686cb4410852aa6cd4c Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 14 Oct 2022 18:08:40 -0400
Subject: [PATCH 1/3] Remove conditional for 12.1 repopick

Patches have been officially merged

Signed-off-by: Sakshi Aggarwal <81718060+sakshiagrwal@users.noreply.github.com>
---
 .github/workflows/Recovery Build.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml
index e361352..7f78445 100644
--- a/.github/workflows/Recovery Build.yml	
+++ b/.github/workflows/Recovery Build.yml	
@@ -148,13 +148,6 @@ jobs:
       with:
         swap-size-gb: 12
 
-    - name: Check Build Branch
-      if: ${{ github.event.inputs.MANIFEST_BRANCH == 'twrp-12.1' }}
-      run: |
-        source build/envsetup.sh
-        repopick 5405 5540
-      working-directory: ${{ steps.pwd.outputs.pwd }}
-
     - name: Building recovery
       run: |
         source build/envsetup.sh

From 3fe586fe33abc7a16e7ea1a692f81ccabacf79c8 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Mon, 17 Oct 2022 11:08:22 -0400
Subject: [PATCH 2/3] Remove set-output commands

Remove unused variable and update deprecated code

Signed-off-by: Sakshi Aggarwal <81718060+sakshiagrwal@users.noreply.github.com>
---
 .github/workflows/Recovery Build.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml
index 7f78445..3d241cf 100644
--- a/.github/workflows/Recovery Build.yml	
+++ b/.github/workflows/Recovery Build.yml	
@@ -88,11 +88,6 @@ jobs:
           ssh-private-key: |
               ${{ secrets.SSH_PRIVATE_KEY }}
 
-    - name: Set variables
-      run: |
-        echo "::set-output name=date::$(date +%F)"
-      id: var
-      
     - name: Install repo
       run: |
         mkdir ~/bin
@@ -104,7 +99,7 @@ jobs:
       run: |
         mkdir workspace
         cd workspace
-        echo "::set-output name=pwd::$(pwd)"
+        echo "workspace-folder=$(pwd)" >> $GITHUB_OUTPUT
         git config --global user.name "Captain Throwback"
         git config --global user.email "captainthrowback@hotmail.com"
         repo init --depth=1 -u ${{ github.event.inputs.MANIFEST_URL }} -b ${{ github.event.inputs.MANIFEST_BRANCH }}
@@ -118,7 +113,7 @@ jobs:
     - name: Clone device tree
       run: |
         git clone ${{ github.event.inputs.DEVICE_TREE_URL }} -b ${{ github.event.inputs.DEVICE_TREE_BRANCH }} ./${{ github.event.inputs.DEVICE_PATH }}
-      working-directory: ${{ steps.pwd.outputs.pwd }}
+      working-directory: ${{ steps.pwd.outputs.workspace-folder }}
 
     - name: Clone common tree
       if: |
@@ -126,7 +121,7 @@ jobs:
         && github.event.inputs.COMMON_PATH != null
       run: |
         git clone ${{ github.event.inputs.COMMON_TREE_URL }} -b ${{ github.event.inputs.DEVICE_TREE_BRANCH }} ./${{ github.event.inputs.COMMON_PATH }}
-      working-directory: ${{ steps.pwd.outputs.pwd }}
+      working-directory: ${{ steps.pwd.outputs.workspace-folder }}
 
     - name: Check Build Tree
       uses: haya14busa/action-cond@v1
@@ -140,7 +135,7 @@ jobs:
       run: |
         bash ${GITHUB_WORKSPACE}/scripts/convert.sh ${{ github.event.inputs.DEVICE_PATH }}/${{ steps.buildtree.outputs.value }}.dependencies
         repo sync -j$(nproc --all)
-      working-directory: ${{ steps.pwd.outputs.pwd }}
+      working-directory: ${{ steps.pwd.outputs.workspace-folder }}
       continue-on-error: true
 
     - name: Set Swap Space
@@ -153,7 +148,7 @@ jobs:
         source build/envsetup.sh
         export ALLOW_MISSING_DEPENDENCIES=true
         lunch ${{ github.event.inputs.MAKEFILE_NAME }}-eng && make clean && make ${{ github.event.inputs.BUILD_TARGET }}image -j$(nproc --all)
-      working-directory: ${{ steps.pwd.outputs.pwd }}
+      working-directory: ${{ steps.pwd.outputs.workspace-folder }}
 
     - name: Upload to Release
       uses: softprops/action-gh-release@v1

From 0e5391f7907431c26a699076cddc5eb992de7a55 Mon Sep 17 00:00:00 2001
From: Sakshi Aggarwal <81718060+sakshiagrwal@users.noreply.github.com>
Date: Wed, 4 Jan 2023 07:42:45 +0000
Subject: [PATCH 3/3] Ubuntu 18.04 [deprecated]
 https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners

Signed-off-by: Sakshi Aggarwal <81718060+sakshiagrwal@users.noreply.github.com>
---
 .github/workflows/Recovery Build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/Recovery Build.yml b/.github/workflows/Recovery Build.yml
index 3d241cf..5561de1 100644
--- a/.github/workflows/Recovery Build.yml	
+++ b/.github/workflows/Recovery Build.yml	
@@ -45,8 +45,7 @@ on:
 jobs:
   build:
     if: github.event.repository.owner.id == github.event.sender.id
-    runs-on: ubuntu-18.04
-    # You can use either of the ubuntu-18.04 or ubuntu-20.04 runner
+    runs-on: ubuntu-20.04
     steps:
     - name: Display Run Parameters
       run: |