Merge branch 'fix_win_ci_segfault' of github.com:pthom/FunctionalPlus…

… into fix_win_ci_segfault
Dobiasd · Jun 12, 2024 · 9795d1d · 9795d1d
2 parents 14fd722 + 4e84b0d
commit 9795d1d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           echo "/host_usr_local/bin" >> $GITHUB_PATH
           script/ci_setup_linux.sh
       - name: Build and Test
-        run: script/ci_run.sh run_tests
+        run: script/ci.sh run_tests
 
 
   build_clang:
@@ -61,7 +61,7 @@ jobs:
           fi
           echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
       - name: Build and Test
-        run: script/ci_run.sh run_tests
+        run: script/ci.sh run_tests
 
 
   build_osx:
@@ -73,7 +73,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Build and Test
-        run: script/ci_run.sh run_tests
+        run: script/ci.sh run_tests
 
 
   build_windows_msvc:
@@ -89,7 +89,7 @@ jobs:
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Build and Test
         shell: bash
-        run: script/ci_run.sh run_tests
+        run: script/ci.sh run_tests
 
 
   formatting-check:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -23,6 +23,6 @@ jobs:
           queries: +security-and-quality
       - name: Build
         shell: bash
-        run: script/ci_run.sh run_build
+        run: script/ci.sh run_build
       - name: CodeQL Analysis
         uses: github/codeql-action/analyze@v3
diff --git a/script/ci_run.sh → script/ci.sh b/script/ci_run.sh → script/ci.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Central script called by the CI
+# Usage: 
+#    ci.sh {run_build|run_tests}
+
 #
 #  Private Impl
 #