From 406db440a4122ece89ffb4667fbefe42ff89d1f6 Mon Sep 17 00:00:00 2001
From: Siddhesh Koyande <34239658+SIDDK24@users.noreply.github.com>
Date: Tue, 14 Jun 2022 20:09:45 +0530
Subject: [PATCH] Update pbrp-organization-ci.yml

---
 .github/workflows/pbrp-organization-ci.yml | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pbrp-organization-ci.yml b/.github/workflows/pbrp-organization-ci.yml
index 37371ef..dea6af3 100644
--- a/.github/workflows/pbrp-organization-ci.yml
+++ b/.github/workflows/pbrp-organization-ci.yml
@@ -10,20 +10,19 @@ on:
         description: 'Build ChangeLogs'
         required: true
         default: 'Sync Latest Source'
-  watch:
-    types: [started]
 
 env:
   BUILD_RELEASE_TYPE: ${{ github.event.inputs.DEPLOY_TYPE }}
   CHANGELOG: ${{ github.event.inputs.ChangeLogs }}
   BOT_API: ${{ secrets.BOT_API }}
   GCF_AUTH_KEY: ${{ secrets.GCF_AUTH_KEY }}
-  GH_BOT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
   GitHubMail: ${{ secrets.GitHubMail }}
   GitHubName: ${{ secrets.GitHubName }}
   SFPassword: ${{ secrets.SFPassword }}
   SFUserName: ${{ secrets.SFUserName }}
-  #TARGET: "define this if your target is not recoveryimage"
+  TARGET: "pbrp"
+  #EXTRA_CMD: "Extra Commands Here"
 
 jobs:
   PBRP_CI:
@@ -31,10 +30,8 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-       - name: Cleaning Up Runner
-         uses: rokibhasansagar/slimhub_actions@main
-
        - name: Auto Adapt Manifest
+         # /* if your branch name is other than the one which you dispatched workflow from then set it manually in the place of ${GITHUB_REF##*/}" */ 
          run: echo "MANIFEST=https://github.com/PitchBlackRecoveryProject/manifest_pb -b ${GITHUB_REF##*/}" >> $GITHUB_ENV
 
        - name: Export Vars
@@ -43,8 +40,25 @@ jobs:
               if [[ ${BUILD_RELEASE_TYPE} == "BETA" ]]; then echo "BETA_BUILD=true"  >> $GITHUB_ENV;fi
               if [[ ${BUILD_RELEASE_TYPE} == "OFFICIAL" ]]; then echo "PB_OFFICIAL=true"  >> $GITHUB_ENV;fi
 
+       - name: Checkout Cleaning Up Runner Repo
+         uses: actions/checkout@v2
+         with:
+           repository: PitchBlackRecoveryProject/Cleaner
+           ref: main
+           token: ${{ secrets.GH_BOT_TOKEN }}
+           path: .github/actions/Cleaner
+       - name: Cleaning
+         uses: ./.github/actions/Cleaner
+
+       - name: Checkout Recovery Compiler Repo
+         uses: actions/checkout@v2
+         with:
+           repository: PitchBlackRecoveryProject/Compiler
+           ref: production
+           token: ${{ secrets.GH_BOT_TOKEN }}
+           path: .github/actions/Compiler
        - name: Recovery Compilation
-         uses: PitchBlackRecoveryProject/Recovery-Compiler@production
+         uses: ./.github/actions/Compiler
        
        - name: Release Builds 
          run: |