From e208c2960ec16fe7be6faa4f2a8e5d1a899a321f Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 22 Sep 2022 14:34:58 +0200
Subject: [PATCH] hmm

---
 .github/workflows/test.yaml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 051c3bb604..92b3529b53 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -17,20 +17,14 @@ jobs:
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
         name: Checkout
-        with:
-          fetch-depth: 1
 
       - name: catalog tests
         run: |
           echo "Starting Catalog Validation"
           /usr/local/bin/catalog_validate validate --path "${PWD}"
-          
-      - uses: actions/checkout@master
-
-      - name: Merge staging -> main
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          from_branch: staging
-          target_branch: main
-          github_token: ${{ github.token }}
\ No newline at end of file
+            
+      - name: Merge master back to dev
+        run: |
+          git config user.name "TrueCharts-Bot"
+          git config user.email "bot@truecharts.org"
+          git push origin staging:main
\ No newline at end of file