From 4efe75174ec81e8183941d9e31a54e1ba0da0818 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 20 Mar 2026 21:51:53 +0000
Subject: [PATCH] Fix skipci CI/CD skip feature in GitHub Actions workflow

Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com>
Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/e765016c-a3e8-4423-b21c-b05ec19cb97a
---
 .github/workflows/build-and-release.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index fefa6400..144e9819 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: ${{ always() && needs.fetch-translations.result != 'failure' }}
+    if: ${{ always() && needs.fetch-translations.result != 'failure' && needs.determine-build.result != 'skipped' }}
     needs: [determine-build, fetch-translations]
     timeout-minutes: 15
     strategy:
@@ -148,7 +148,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
-    if: ${{ !contains(github.event.head_commit.message, 'skip') || !contains(github.event.head_commit.message, 'skipci')}}
+    if: >-
+      ${{
+        !contains(github.event.head_commit.message, 'skipci') &&
+        !contains(github.event.head_commit.message, '[skipci]') &&
+        !contains(github.event.head_commit.message, 'skipci | ') &&
+        !contains(github.event.pull_request.title, 'skipci') &&
+        !contains(github.event.pull_request.title, '[skipci]') &&
+        !contains(github.event.pull_request.title, 'skipci | ')
+      }}
     steps:
       - name: dummy action
         run: "echo 'dummy action that checks if the build is to be skipped, if it is, this action does not run to break the entire build action'"