From 48a63bccbe967935e10893c824dc9ef2fd33006a Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sat, 28 Jun 2025 17:02:27 -0500
Subject: [PATCH] add merge step

---
 .gitea/workflows/lint-test-docker.yaml | 13 +++++++++++++
 .gitea/workflows/lint-test-helm.yaml   | 12 ++++++++++++
 .gitea/workflows/renovate.yaml         |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/lint-test-docker.yaml b/.gitea/workflows/lint-test-docker.yaml
index a9b6ff02f..7bde1410d 100644
--- a/.gitea/workflows/lint-test-docker.yaml
+++ b/.gitea/workflows/lint-test-docker.yaml
@@ -24,12 +24,25 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check Branch Exists
+        id: check-branch-exists
+        uses: GuillaumeFalourd/branch-exists@v1.1
+        with:
+          branch: "origin/${{ github.base_ref }}"
+
+      - name: Branch Does Not Exist
+        if: steps.check-branch-exists.outputs.exists == 'false'
+        run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged"
+
+
       - name: Set up Node.js
+        if: steps.check-branch-exists.outputs.exists == 'true'
         uses: actions/setup-node@v4
         with:
           node-version: '22'
 
       - name: Lint Docker Compose
+        if: steps.check-branch-exists.outputs.exists == 'true'
         run: |
           set -e  # Exit immediately if a command exits with a non-zero status.
 
diff --git a/.gitea/workflows/lint-test-helm.yaml b/.gitea/workflows/lint-test-helm.yaml
index e84235876..6f914ffc8 100644
--- a/.gitea/workflows/lint-test-helm.yaml
+++ b/.gitea/workflows/lint-test-helm.yaml
@@ -24,13 +24,25 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check Branch Exists
+        id: check-branch-exists
+        uses: GuillaumeFalourd/branch-exists@v1.1
+        with:
+          branch: "origin/${{ github.base_ref }}"
+
+      - name: Branch Does Not Exist
+        if: steps.check-branch-exists.outputs.exists == 'false'
+        run: echo "Branch origin/${{ github.base_ref }} was not found, likely already merged"
+
       - name: Set up Helm
+        if: steps.check-branch-exists.outputs.exists == 'true'
         uses: azure/setup-helm@v4
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
 
       - name: Lint Helm Chart
+        if: steps.check-branch-exists.outputs.exists == 'true'
         run: |
           set -e  # Exit immediately if a command exits with a non-zero status.
 
diff --git a/.gitea/workflows/renovate.yaml b/.gitea/workflows/renovate.yaml
index 416ffeb0e..5a5a14450 100644
--- a/.gitea/workflows/renovate.yaml
+++ b/.gitea/workflows/renovate.yaml
@@ -25,7 +25,7 @@ jobs:
           RENOVATE_ENDPOINT: ${{ vars.INSTANCE_URL }}
           RENOVATE_REPOSITORIES: alexlebens/infrastructure
           RENOVATE_GIT_AUTHOR: Renovate Bot <renovate-bot@alexlebens.net>
-          LOG_LEVEL: debug
+          LOG_LEVEL: info
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.RENOVATE_GIT_PRIVATE_KEY }}
           RENOVATE_GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_COM_TOKEN }}