From d8f5900f89018c955ef84c1f94e1aeb3799fc4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nowacki?= <michal.nowacki@reef.pl>
Date: Thu, 23 Nov 2023 23:50:22 +0100
Subject: [PATCH] citest

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64d7b7883..9dae64886 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [master]
+    branches: [master, citest6000]
   pull_request:
     branches: [master]
 
@@ -28,7 +28,7 @@ jobs:
       - name: Run linters
         run: nox -vs lint
       - name: Validate new changelog entries
-        if: contains(github.event.pull_request.labels.*.name, '-changelog') == false
+        if: (contains(github.event.pull_request.labels.*.name, '-changelog') == false) and (github.event.pull_request.base.ref != '')
         run: if [ -z "$(git diff --diff-filter=A --name-only origin/${{ github.event.pull_request.base.ref }} changelog.d)" ];
           then echo no changelog item added; exit 1; fi