From 58e770dfc6f6cbbae6b3843dbdf0e60063f3b08f Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 21 Aug 2022 13:25:38 +0200 Subject: [PATCH] :wrench: less use of ghcr.io/nlohmann/json-ci --- .github/workflows/ubuntu.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 70e523198..c9abb053f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -43,7 +43,7 @@ jobs: container: ghcr.io/nlohmann/json-ci:v2.4.0 strategy: matrix: - target: [ci_cppcheck, ci_test_valgrind, ci_test_amalgamation, ci_infer] + target: [ci_cppcheck, ci_test_valgrind, ci_test_amalgamation, ci_test_single_header, ci_single_binaries, ci_infer] steps: - uses: actions/checkout@v3 - name: Run CMake @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [ci_cpplint, ci_cmake_flags, ci_single_binaries, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata] + target: [ci_cpplint, ci_cmake_flags, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata] steps: - uses: actions/checkout@v3 - name: Get latest CMake and ninja @@ -80,16 +80,6 @@ jobs: - name: Build run: cmake --build build --target ${{ matrix.target }} - ci_test_single_header: - runs-on: ubuntu-latest - container: ghcr.io/nlohmann/json-ci:v2.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_single_header - ci_cmake_options: runs-on: ubuntu-latest strategy: