From 662f5a771f3807bf7ebd5a3989230d5d0a26659d Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Mon, 15 Nov 2021 12:51:20 +0100 Subject: Squashed 'deps/inja/' changes from 811e173..eb04bfc eb04bfc clang-format 81cfa14 init LiteralNode with string view, code cleaning 2da715a parse_filename without json 623c267 make_result and code cleaning 1206913 rename json -> data d38c07e clang 5 minimum a067a8b make all tests C++17 098de66 inja_test C++17 173c1f5 fix C++17 2239e23 remove string view polyfill fb55f2e update minimum compiler 751d27d fix MIT license 635e1fb change readme example 5a4ac92 update single include d038c53 set .cpp in readme cf71b54 add include callback 9b9dd96 introduce INJA_DATA_TYPE 12a2c9b unify json data type 4505fd0 add tests for assignments 2d51507 set version 3.3 2ba5783 Merge branch 'master' of github.com:pantor/inja 99b85d6 remove headers in files, add central header 14f0d38 Fixed an issue with round (#207) c70fd58 Merge branch 'master' of github.com:pantor/inja 8a9aee1 add jinja python test script 91c93bf add join function (#204) 9cf7db8 add warnings for benchmark, fix for inja_throw e91a2fd #ifndef INJA_THROW 8d65633 add warnings for clang and fix them eaec58d update nlohmann/json to master 4ccadd5 update to json=3.9.1, doctest=2.4.6 83feb26 update single include 4e90947 at function for objects b473873 compactify assignments readme 798a0b9 Add support for setting subobjects via JSON pointer in set statements. (#202) 86f38f0 update single include d9ad8d1 whitespace control for comments 95af782 Add Child Inheritance Feature (#198) b4b9d8d Fix build warnings for Clang and MSVC (#197) b14f8a1 add ci for gcc 10, 11 06ff271 add no excpetion test 2491980 Fix inclusion in translation units with exceptions disabled. (#196) 4d5a7d1 fix single include eac2162 fix include of in-memory templates ca3c7a0 add test for short circuit evaluation 389c1d6 short circuit evaluation git-subtree-dir: deps/inja git-subtree-split: eb04bfc7d3cf0a5fbd0ed37a88d064230d0af377 --- .github/workflows/ci.yml | 79 ++++++++++++------------------------ .github/workflows/documentation.yml | 2 +- .github/workflows/single-include.yml | 6 +-- 3 files changed, 29 insertions(+), 58 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5909c3..c499221 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,24 +16,19 @@ jobs: fail-fast: false matrix: name: [ - ubuntu-18.04-gcc-4.9, - ubuntu-18.04-gcc-5, - ubuntu-18.04-gcc-6, ubuntu-18.04-gcc-7, ubuntu-18.04-gcc-8, ubuntu-18.04-gcc-9, - ubuntu-18.04-clang-3.5, - ubuntu-18.04-clang-3.8, - ubuntu-18.04-clang-4.0, + ubuntu-20.04-gcc-10, + ubuntu-20.04-gcc-11, ubuntu-18.04-clang-5.0, ubuntu-18.04-clang-6.0, ubuntu-18.04-clang-7, ubuntu-18.04-clang-8, ubuntu-20.04-clang-9, - windows-2016-cl, - windows-2016-clang-cl, - windows-2016-clang, - windows-2016-gcc, + ubuntu-20.04-clang-10, + ubuntu-20.04-clang-11, + ubuntu-20.04-clang-11-no-exceptions, windows-2019-cl, windows-2019-clang-cl, windows-2019-clang, @@ -46,21 +41,6 @@ jobs: ] include: - - name: ubuntu-18.04-gcc-4.9 - os: ubuntu-18.04 - compiler: gcc - version: "4.9" - - - name: ubuntu-18.04-gcc-5 - os: ubuntu-18.04 - compiler: gcc - version: "5" - - - name: ubuntu-18.04-gcc-6 - os: ubuntu-18.04 - compiler: gcc - version: "6" - - name: ubuntu-18.04-gcc-7 os: ubuntu-18.04 compiler: gcc @@ -76,20 +56,15 @@ jobs: compiler: gcc version: "9" - - name: ubuntu-18.04-clang-3.5 - os: ubuntu-18.04 - compiler: clang - version: "3.5" - - - name: ubuntu-18.04-clang-3.8 - os: ubuntu-18.04 - compiler: clang - version: "3.8" + - name: ubuntu-20.04-gcc-10 + os: ubuntu-20.04 + compiler: gcc + version: "10" - - name: ubuntu-18.04-clang-4.0 - os: ubuntu-18.04 - compiler: clang - version: "4.0" + - name: ubuntu-20.04-gcc-11 + os: ubuntu-20.04 + compiler: gcc + version: "11" - name: ubuntu-18.04-clang-5.0 os: ubuntu-18.04 @@ -116,26 +91,26 @@ jobs: compiler: clang version: "9" - - name: windows-2016-cl - os: windows-2016 - compiler: cl + - name: ubuntu-20.04-clang-10 + os: ubuntu-20.04 + compiler: clang + version: "10" - - name: windows-2016-clang-cl - os: windows-2016 - compiler: clang-cl + - name: ubuntu-20.04-clang-11 + os: ubuntu-20.04 + compiler: clang + version: "11" - - name: windows-2016-clang - os: windows-2016 + - name: ubuntu-20.04-clang-11-no-exceptions + os: ubuntu-20.04 compiler: clang + version: "11" + cmake_vars: "-DCMAKE_CXX_FLAGS=-fno-exceptions -DBUILD_TESTING=OFF -DBUILD_BENCHMARK=ON" - name: windows-2019-cl os: windows-2019 compiler: cl - - name: windows-2016-gcc - os: windows-2016 - compiler: gcc - - name: windows-2019-clang-cl os: windows-2019 compiler: clang-cl @@ -174,7 +149,7 @@ jobs: version: "12.2" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install (Linux) if: runner.os == 'Linux' @@ -256,6 +231,6 @@ jobs: - name: Build & Test Release run: | cmake -E remove_directory build - cmake -B build -S . -DCMAKE_BUILD_TYPE=Release + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_vars }} cmake --build build -j2 cd build && ctest -j2 --output-on-failure diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index cddd438..e32cfeb 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,7 +9,7 @@ jobs: build-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: dependencies env: diff --git a/.github/workflows/single-include.yml b/.github/workflows/single-include.yml index 44a5a66..a7b0a7f 100644 --- a/.github/workflows/single-include.yml +++ b/.github/workflows/single-include.yml @@ -6,7 +6,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: update single include run: | @@ -17,10 +17,6 @@ jobs: working-directory: ${{runner.workspace}}/inja/single_include/ shell: bash run: | - pwd - ls inja - cat inja/inja.hpp - cat inja/inja_old.hpp diff inja/inja.hpp inja/inja_old.hpp >/dev/null - uses: actions/upload-artifact@v1 -- cgit v1.2.3