Use split json-ci images

falbrechtskirchinger · Aug 10, 2022 · a849402 · a849402
1 parent a92ccaf
commit a849402
Showing 1 changed file with 119 additions and 16 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -16,7 +16,7 @@ concurrency:
 jobs:
   ci_test_clang:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang3:main
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
@@ -26,20 +26,59 @@ jobs:
 
   ci_test_gcc:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc2:main
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
         run: cmake --build build --target ci_test_gcc
 
+  ci_test_valgrind:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc3:main
+    strategy:
+      matrix:
+        target: [ci_test_valgrind]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_valgrind
+
+  ci_static_analysis_clang:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang3:main
+    strategy:
+      matrix:
+        target: [ci_test_clang_sanitizer, ci_clang_analyze]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
+  ci_static_analysis_extra:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-extra:main
+    strategy:
+      matrix:
+        target: [ci_cmake_flags]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ${{ matrix.target }}
+
   ci_static_analysis:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-tools:main
     strategy:
       matrix:
-        target: [ci_clang_tidy, ci_cppcheck, ci_test_valgrind, ci_test_clang_sanitizer, ci_test_amalgamation, ci_clang_analyze, ci_cpplint, ci_cmake_flags, ci_single_binaries, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_infer]
+        target: [ci_cppcheck, ci_test_amalgamation, ci_cpplint, ci_single_binaries, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_infer]
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
@@ -49,7 +88,7 @@ jobs:
 
   ci_test_single_header:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc3:main
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
@@ -59,7 +98,7 @@ jobs:
 
   ci_cmake_options:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc3:main
     strategy:
       matrix:
         target: [ci_test_diagnostics, ci_test_noexceptions, ci_test_noimplicitconversions, ci_test_legacycomparison, ci_test_noglobaludls]
@@ -72,7 +111,7 @@ jobs:
 
   ci_test_coverage:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc3:main
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
@@ -90,36 +129,100 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ${{ github.workspace }}/build/json.info.filtered.noexcept
 
-  ci_test_compilers:
+  ci_test_compilers_gcc1:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc1:main
+    strategy:
+      matrix:
+        compiler: [g++-4.8, g++-4.9, g++-5, g++-6, g++-7, g++-8]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
+
+  ci_test_compilers_gcc2:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc2:main
     strategy:
       matrix:
-        compiler: [g++-4.8, g++-4.9, g++-5, g++-6, g++-7, g++-8, g++-9, g++-10, g++-11, clang++-3.5, clang++-3.6, clang++-3.7, clang++-3.8, clang++-3.9, clang++-4.0, clang++-5.0, clang++-6.0, clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12, clang++-13, clang++-14]
+        compiler: [g++-9, g++-10, g++-11]
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
         run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
 
-  ci_test_standards:
+  ci_test_compilers_clang1:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang1:main
+    strategy:
+      matrix:
+        compiler: [clang++-3.5, clang++-3.6, clang++-3.7, clang++-3.8, clang++-3.9, clang++-4.0]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
+
+  ci_test_compilers_clang2:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang2:main
+    strategy:
+      matrix:
+        compiler: [clang++-5.0, clang++-6.0, clang++-7, clang++-8, clang++-9, clang++-10]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
+
+  ci_test_compilers_clang3:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang3:main
+    strategy:
+      matrix:
+        compiler: [clang++-11, clang++-12, clang++-13, clang++-14]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
+
+  ci_test_standards_gcc:
+    runs-on: ubuntu-latest
+    container: ghcr.io/falbrechtskirchinger/json-ci-gcc2:main
+    strategy:
+      matrix:
+        standard: [11, 14, 17, 20]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run CMake
+        run: cmake -S . -B build -DJSON_CI=On
+      - name: Build
+        run: cmake --build build --target ci_test_gcc_cxx${{ matrix.standard }}
+
+  ci_test_standards_clang:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-clang3:main
     strategy:
       matrix:
         standard: [11, 14, 17, 20]
-        compiler: [gcc, clang]
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
         run: cmake -S . -B build -DJSON_CI=On
       - name: Build
-        run: cmake --build build --target ci_test_${{ matrix.compiler }}_cxx${{ matrix.standard }}
+        run: cmake --build build --target ci_test_clang_cxx${{ matrix.standard }}
 
   ci_cuda_example:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.4.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-extra:main
     steps:
       - uses: actions/checkout@v3
       - name: Run CMake
@@ -129,7 +232,7 @@ jobs:
 
   ci_icpc:
     runs-on: ubuntu-latest
-    container: ghcr.io/nlohmann/json-ci:v2.2.0
+    container: ghcr.io/falbrechtskirchinger/json-ci-icpc:main
     steps:
       - uses: actions/checkout@v2
       - name: Run CMake