From b9e5a2cdfeaaf9d51e079893ab333f1f4abc769f Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Sat, 10 Aug 2024 22:24:35 +0100
Subject: [PATCH] Use a release branch for the github action

---
 .github/workflows/test.yml | 7 +++++++
 run.sh                     | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3669766..ffb2bb8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,3 +24,10 @@ jobs:
     - name: Run tests with pytest
       run: |
         pytest
+    - name: Update release branch
+      if: github.ref == 'refs/heads/main'
+      run: |
+        git fetch origin
+        git checkout -b release
+        git merge --no-ff origin/${{ github.head_commit.id }}
+        git push origin release
\ No newline at end of file
diff --git a/run.sh b/run.sh
index 10bbe3c..b3a3f3d 100755
--- a/run.sh
+++ b/run.sh
@@ -4,6 +4,5 @@ set -e
 
 while python matchy.py
 do
-    git fetch
-    git checkout validated
+    git pull
 done