From d86c8e9fe873cc6d97c16647b8f3ccf5a7433555 Mon Sep 17 00:00:00 2001
From: ado <adnan.abd0124@gmail.com>
Date: Mon, 7 Aug 2023 01:26:40 +0200
Subject: [PATCH] Update ci workflows

---
 .github/workflows/ubuntu-latest-clang.yml | 3 +++
 .github/workflows/ubuntu-latest-icc.yml   | 4 ++--
 .github/workflows/win-msvc.yml            | 4 ++--
 .github/workflows/win-msys2-clang.yml     | 8 ++++----
 .github/workflows/win-msys2-gcc.yml       | 8 ++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml
index c48b309..6615263 100644
--- a/.github/workflows/ubuntu-latest-clang.yml
+++ b/.github/workflows/ubuntu-latest-clang.yml
@@ -36,6 +36,9 @@ jobs:
 
       options: -v /usr/local:/host_usr_local
 
+    env:
+      CXXFLAGS: -stdlib=libc++
+
     steps:
       - uses: actions/checkout@v1
 
diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml
index 9bbcce2..553c1c2 100644
--- a/.github/workflows/ubuntu-latest-icc.yml
+++ b/.github/workflows/ubuntu-latest-icc.yml
@@ -17,8 +17,8 @@ on:
 
 env:
   URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431
-  LINUX_BASEKIT_URL: ${{env.URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh
-  LINUX_HPCKIT_URL: ${{env.URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh
+  LINUX_BASEKIT_URL: ${{URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh
+  LINUX_HPCKIT_URL: ${{URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh
 
 jobs:
   icc_tests:
diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml
index 9225249..abd2275 100644
--- a/.github/workflows/win-msvc.yml
+++ b/.github/workflows/win-msvc.yml
@@ -25,8 +25,6 @@ jobs:
       run:
         shell: bash
 
-    runs-on: ${{matrix.config.os}}
-
     strategy:
       fail-fast: false
       matrix:
@@ -40,6 +38,8 @@ jobs:
         build: [Debug, Release]
         platform: [Win32, x64]
 
+    runs-on: ${{matrix.config.os}}
+
     name: "${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}}"
 
     steps:
diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml
index dfdf134..7761430 100644
--- a/.github/workflows/win-msys2-clang.yml
+++ b/.github/workflows/win-msys2-clang.yml
@@ -21,10 +21,6 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
 
-    name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
-
-    runs-on: ${{matrix.os}}
-
     defaults:
       run:
         shell: msys2 {0}
@@ -46,6 +42,10 @@ jobs:
               git mingw-w64-i686-cmake mingw-w64-i686-ninja
               mingw-w64-i686-clang
 
+    runs-on: ${{matrix.os}}
+
+    name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
+
     env:
       CMAKE_GENERATOR: Ninja
 
diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml
index 7cd4406..e571e9b 100644
--- a/.github/workflows/win-msys2-gcc.yml
+++ b/.github/workflows/win-msys2-gcc.yml
@@ -21,10 +21,6 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
 
-    name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
-
-    runs-on: ${{matrix.os}}
-
     defaults:
       run:
         shell: msys2 {0}
@@ -46,6 +42,10 @@ jobs:
               git mingw-w64-i686-cmake mingw-w64-i686-ninja
               mingw-w64-i686-gcc
 
+    runs-on: ${{matrix.os}}
+
+    name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
+
     env:
       CMAKE_GENERATOR: Ninja