From 6b2d29012995beddcec674df2eabaac6bfd931c7 Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Fri, 14 Jan 2022 17:09:10 +0100
Subject: [PATCH] Update check-git-apply.yaml

---
 .github/workflows/check-git-apply.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-git-apply.yaml b/.github/workflows/check-git-apply.yaml
index de833a45..a424e411 100644
--- a/.github/workflows/check-git-apply.yaml
+++ b/.github/workflows/check-git-apply.yaml
@@ -18,13 +18,17 @@ jobs:
       - name: Prepare container
         run: |
           sudo apt update
-          sudo apt install -y wget unzip tar sed dos2unix patchutils wiggle
+          sudo apt install -y wget unzip tar sed dos2unix patchutils wiggle curl
           
           wget https://github.com/uazo/superpatch/releases/latest/download/SuperPatchUtils.tar.gz
           tar xfz SuperPatchUtils.tar.gz
           rm SuperPatchUtils.tar.gz
           
           git clone https://github.com/uazo/bromite-buildtools
+          
+          wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
+          unzip pup_v0.4.0_linux_amd64.zip
+          rm pup_v0.4.0_linux_amd64.zip
 
       - name: Download bromite sources
         run: |
@@ -78,14 +82,18 @@ jobs:
           echo "CHANGES=$CHANGES" >> $GITHUB_ENV
           
           if [[ CHANGES -eq 1 ]]; then
+              BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$RTAG | ../pup -p li.branch a text{})
+              echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+              
               git add .
           fi
           
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.10.1
+        uses: peter-evans/create-pull-request@v3.12.0
         if: env.CHANGES == '1'
         with:
           path: bromite
+          branch: ${{ env.BRANCH }}
           add-paths: |
             build/patches/*.patch
           commit-message: Check git apply result