From 414c72adbcf775fda117c5b7e235a33c40a1fc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Fekete?= <bandi13@users.noreply.github.com>
Date: Mon, 30 Jan 2023 13:10:54 -0500
Subject: [PATCH] Fix workflow concurrency (#6031)

* First test of the consolidated workflows
Co-authored-by: Andras Fekete <andras@wolfssl.com>
---
 .github/workflows/docker-Espressif.yml |  9 +--------
 .github/workflows/docker-OpenWrt.yml   |  8 +-------
 .github/workflows/main.yml             | 20 ++++++++++++++++++++
 .github/workflows/multi-compiler.yml   |  8 +-------
 .github/workflows/os-check.yml         |  8 +-------
 5 files changed, 24 insertions(+), 29 deletions(-)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/docker-Espressif.yml b/.github/workflows/docker-Espressif.yml
index 92841a93a..3976b8e0c 100644
--- a/.github/workflows/docker-Espressif.yml
+++ b/.github/workflows/docker-Espressif.yml
@@ -1,13 +1,6 @@
 name: Espressif examples tests
-concurrency:
-  group: ${{ github.head_ref || github.run_id }}
-#  cancel-in-progress: true
-
 on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
+  workflow_call:
 
 jobs:
   espressif_latest:
diff --git a/.github/workflows/docker-OpenWrt.yml b/.github/workflows/docker-OpenWrt.yml
index 4fdf13a58..70c05ffe1 100644
--- a/.github/workflows/docker-OpenWrt.yml
+++ b/.github/workflows/docker-OpenWrt.yml
@@ -1,15 +1,9 @@
 # This workflow tests out new libraries with existing OpenWrt builds to check
 # there aren't any compatibility issues. Take a look at Docker/OpenWrt/README.md
 name: OpenWrt test
-concurrency:
-    group: ${{ github.head_ref || github.run_id }}
-#    cancel-in-progress: true
 
 on:
-    push:
-        branches: [ 'master', 'main', 'release/**' ]
-    pull_request:
-        branches: [ '*' ]
+    workflow_call:
 
 jobs:
     build_library:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..8a9b1737a
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,20 @@
+name: wolfSSL CI tests
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [ 'master', 'main', 'release/**' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+    call_docker-Espressif:
+        uses: ./.github/workflows/docker-Espressif.yml
+    call_multi-compiler:
+        uses: ./.github/workflows/multi-compiler.yml
+    call_docker-OpenWrt:
+        uses: ./.github/workflows/docker-OpenWrt.yml
+    call_os-check:
+        uses: ./.github/workflows/os-check.yml
diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml
index c67c95886..264e3acf4 100644
--- a/.github/workflows/multi-compiler.yml
+++ b/.github/workflows/multi-compiler.yml
@@ -1,13 +1,7 @@
 name: Multiple compilers and versions
-concurrency:
-  group: ${{ github.head_ref || github.run_id }}
-#  cancel-in-progress: true
 
 on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
+  workflow_call:
 
 jobs:
   my_matrix:
diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml
index ca8fa35a8..1cc683624 100644
--- a/.github/workflows/os-check.yml
+++ b/.github/workflows/os-check.yml
@@ -1,13 +1,7 @@
 name: Ubuntu-Macos-Windows Tests
-concurrency:
-  group: ${{ github.head_ref || github.run_id }}
-#  cancel-in-progress: true
 
 on:
-  push:
-    branches: [ 'master', 'main', 'release/**' ]
-  pull_request:
-    branches: [ '*' ]
+  workflow_call:
 
 jobs:
   make_check: