From 7a4e88c8695aaec291d4d5521e52b4ca53dcdf4a Mon Sep 17 00:00:00 2001
From: Matt Budz <matt.budz@protonmail.com>
Date: Wed, 26 Jun 2024 12:10:44 +0200
Subject: [PATCH 1/4] test ci

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3a90ae93a..b8c422c8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 [v#.#.#] ([month] [YYYY])
+  - TESTING CI
   - Liquid: Make project-level collections available for Liquid syntax
   - Upgraded gems: nokogiri, rails, rexml
   - Bugs fixes:

From 7272e5b7232add611574a7d5b6e5f7381086426a Mon Sep 17 00:00:00 2001
From: Matt Budz <matt.budz@protonmail.com>
Date: Wed, 26 Jun 2024 12:15:07 +0200
Subject: [PATCH 2/4] add fallback branch for rubocop to compare against when
 manually triggering CI

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67412b781..5d867258c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
       IS_MERGE: ${{ github.base_ref == '' }}
       PREV_SHA: ${{ github.event.before }}
       TARGET_BRANCH: ${{ github.base_ref }}
+      FALLBACK_BRANCH: 'develop'
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
@@ -40,7 +41,7 @@ jobs:
         with:
           bundler-cache: true
       - name: Lint changed files
-        run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA }} ${{ env.IS_MERGE }}
+        run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA || env.FALLBACK_BRANCH }} ${{ env.IS_MERGE }}
   rspec:
     name: RSpec
     needs: [audits, rubocop]

From 2aa4046c4fcca3c1a132d9739b03320909a02b97 Mon Sep 17 00:00:00 2001
From: Matt Budz <matt.budz@protonmail.com>
Date: Wed, 26 Jun 2024 12:17:45 +0200
Subject: [PATCH 3/4] add `origin/` prefix to fallback branch

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d867258c..562e874d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       IS_MERGE: ${{ github.base_ref == '' }}
       PREV_SHA: ${{ github.event.before }}
       TARGET_BRANCH: ${{ github.base_ref }}
-      FALLBACK_BRANCH: 'develop'
+      FALLBACK_BRANCH: 'origin/develop'
     steps:
       - name: Checkout code
         uses: actions/checkout@v1

From a21f9c1c5589793867f6bddf4b0b7c5a5daf780f Mon Sep 17 00:00:00 2001
From: Matt Budz <matt.budz@protonmail.com>
Date: Wed, 26 Jun 2024 12:27:19 +0200
Subject: [PATCH 4/4] Revert "test ci"

This reverts commit 7a4e88c8695aaec291d4d5521e52b4ca53dcdf4a.
---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b8c422c8f..3a90ae93a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,4 @@
 [v#.#.#] ([month] [YYYY])
-  - TESTING CI
   - Liquid: Make project-level collections available for Liquid syntax
   - Upgraded gems: nokogiri, rails, rexml
   - Bugs fixes: