From: Pasukhin Dmitry <dpasukhi@opencascade.com>
Date: Thu, 15 May 2025 18:34:23 +0000 (+0100)
Subject: Testing - IR integration enable concurrency #536
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=ebc3885799e1bec916100d934ff443d77c72667c;p=occt.git

Testing - IR integration enable concurrency #536

Fix concurrency cancel-in-progress condition in CI workflow for IR branch
---

diff --git a/.github/workflows/build-and-test-multiplatform.yml b/.github/workflows/build-and-test-multiplatform.yml
index 51acbd0601..17a9474c46 100644
--- a/.github/workflows/build-and-test-multiplatform.yml
+++ b/.github/workflows/build-and-test-multiplatform.yml
@@ -14,8 +14,10 @@ on:
       - 'master'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: ${{ !(github.ref == 'refs/heads/IR' && github.repository == 'Open-Cascade-SAS/OCCT') }}
+  group: ${{ github.event_name == 'pull_request' 
+    && format('{0}-{1}', github.workflow, github.event.pull_request.number)
+    || format('{0}-{1}', github.workflow, github.run_id) }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' && !(github.head_ref == 'IR' && github.repository == 'Open-Cascade-SAS/OCCT') && true || false }}
 
 jobs:
   clang-format: