GHI #20 Minor fix for workflow, 8/...

Signed-off-by: doodspav <[email protected]>
doodspav · Oct 30, 2023 · 1c7a07c · 1c7a07c
1 parent 9956950
commit 1c7a07c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/.github/workflows/test-base.yml b/.github/workflows/test-base.yml
@@ -20,8 +20,12 @@ jobs:
             preset: patomic-ci-unix-clang
           - os: ubuntu-latest
             preset: patomic-ci-unix-clang
+          - os: ubuntu-latest
+            preset: patomic-ci-unix-clang-ansi
           - os: ubuntu-latest
             preset: patomic-ci-unix-gcc
+          - os: ubuntu-latest
+            preset: patomic-ci-unix-gcc-ansi
 
     steps:
       - name: Checkout patomic

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -53,23 +53,23 @@
     },
 
     {
-      "name": "patomic-ci-flags-clang",
+      "name": "patomic-ci-warning-flags-clang",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_C_FLAGS_INIT": "-Weverything -Werror -Wpedantic -Wno-c++98-compat -Wno-covered-switch-default -Wno-padded -Wno-unused-function -Wno-atomic-alignment -Wno-poison-system-directories",
         "CMAKE_CXX_FLAGS_INIT": "-Wall -Wextra -Werror -Wpedantic"
       }
     },
     {
-      "name": "patomic-ci-flags-gcc",
+      "name": "patomic-ci-warning-flags-gcc",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_C_FLAGS_INIT": "-Wall -Wextra -Werror -Wpedantic -Wshadow -Wcast-align -Wconversion -Wsign-conversion -Wnull-dereference -Wdouble-promotion -Wstrict-prototypes -Wmisleading-indentation -Wduplicated-branches -Wlogical-op -Wdeclaration-after-statement -Wno-unused-function",
         "CMAKE_CXX_FLAGS_INIT": "-Wall -Wextra -Werror -Wpedantic"
       }
     },
     {
-      "name": "patomic-ci-flags-msvc",
+      "name": "patomic-ci-warning-flags-msvc",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_C_FLAGS_INIT": "/permissive- /volatile:iso /Wall /WX /wd4464 /wd4132 /wd4820 /wd4127 /wd5045 /wd4710 /wd4711 /wd4668",
@@ -95,13 +95,23 @@
         "LDFLAGS": "-fsanitize=address,undefined"
       }
     },
+    {
+      "name": "patomic-ci-flags-gnu-ansi",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_C_FLAGS": "-Wall -Wextra -Werror -Wpedantic -Wno-unused-function -Wno-atomic-alignment",
+        "CMAKE_C_STANDARD": "90",
+        "CMAKE_C_STANDARD_REQUIRED": true,
+        "CMAKE_C_EXTENSIONS": false
+      }
+    },
 
     {
       "name": "patomic-ci-windows-msvc",
       "inherits": [
         "patomic-ci-base",
         "patomic-ci-compiler-msvc",
-        "patomic-ci-flags-msvc"
+        "patomic-ci-warning-flags-msvc"
       ]
     },
 
@@ -110,7 +120,15 @@
       "inherits": [
         "patomic-ci-base",
         "patomic-ci-compiler-clang",
-        "patomic-ci-flags-clang"
+        "patomic-ci-warning-flags-clang"
+      ]
+    },
+    {
+      "name": "patomic-ci-unix-clang-ansi",
+      "inherits": [
+        "patomic-ci-base-skip-install",
+        "patomic-ci-compiler-clang",
+        "patomic-ci-flags-gnu-ansi"
       ]
     },
     {
@@ -134,29 +152,24 @@
       "inherits": [
         "patomic-ci-base",
         "patomic-ci-compiler-gcc",
-        "patomic-ci-flags-gcc"
+        "patomic-ci-warning-flags-gcc"
       ]
     },
     {
-      "name": "patomic-ci-unix-gcc-sanitize",
+      "name": "patomic-ci-unix-gcc-ansi",
       "inherits": [
         "patomic-ci-base-skip-install",
         "patomic-ci-compiler-gcc",
-        "patomic-ci-flags-gnu-sanitize"
+        "patomic-ci-flags-gnu-ansi"
       ]
     },
-
     {
-      "name": "patomic-ci-unix-gnu-ansi",
-      "generator": "Unix Makefiles",
+      "name": "patomic-ci-unix-gcc-sanitize",
       "inherits": [
-        "patomic-ci-base-skip-install"
-      ],
-      "cacheVariables": {
-        "BUILD_TESTING": false,
-        "CMAKE_C_FLAGS": "-Wall -Wextra -Werror -Wpedantic -Wno-unused-function -Wno-atomic-alignment",
-        "CMAKE_C_STANDARD": "90"
-      }
+        "patomic-ci-base-skip-install",
+        "patomic-ci-compiler-gcc",
+        "patomic-ci-flags-gnu-sanitize"
+      ]
     }
   ]
 }