From c273e4d1d4315f286d5774a55317bfb48ccb891a Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Wed, 21 Jun 2023 00:05:11 +0200
Subject: [PATCH] ci: try different setup for prs

---
 .github/workflows/auto-merge.yml           |  2 +-
 .github/workflows/ci.yml                   |  3 ++-
 .github/workflows/renovate-app-version.yml | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 28cc9dd6..c1883052 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,6 +1,7 @@
 name: automerge
 on:
   pull_request:
+    branches: ["renovate/*"]
     types:
       - labeled
       - unlabeled
@@ -10,7 +11,6 @@ on:
       - ready_for_review
       - reopened
       - unlocked
-    branches: ["renovate/*"]
   pull_request_review:
     types:
       - submitted
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9bbb360..883ff80b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,11 @@
 name: Tipi CI
 on:
+  push:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review, labeled]
 
 jobs:
   ci:
-    if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ready') || !startsWith(github.event.pull_request.head.ref, 'renovate/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -47,6 +47,7 @@ jobs:
 
       - name: Check bumped version
         id: check-bumped-version
+        if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ready')
         uses: actions/github-script@v4
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/renovate-app-version.yml b/.github/workflows/renovate-app-version.yml
index e9bfa29c..b93e4831 100644
--- a/.github/workflows/renovate-app-version.yml
+++ b/.github/workflows/renovate-app-version.yml
@@ -1,9 +1,17 @@
 name: Update app version in Renovate Branches
 
 on:
-  push:
-    branches:
-      - renovate/*
+  pull_request:
+    branches: ["renovate/*"]
+    types:
+      - labeled
+      - opened
+      - edited
+      - assigned
+      - synchronize
+      - reopened
+      - unlocked
+      - ready_for_review
 
 jobs:
   update-app-version:
@@ -37,7 +45,7 @@ jobs:
 
       - name: Commit & Push Changes
         run: |
-          git add "apps/*/config.json" && git commit --amend --no-edit --no-verify && git push --force-with-lease || true
+          git add "apps/*/config.json" && git commit -m "chore: update config.json version" --no-edit --no-verify && git push || true
 
       - name: Label this PR as "ready"
         if: github.event_name == 'pull_request'