Commit Graph

77 Commits

Author SHA1 Message Date
Niels Lohmann eaac918034 👷 remove clang9 CI 2020-12-02 08:58:45 +01:00
Niels Lohmann 4080d0b1a4 add test to compile without exceptions 2020-08-10 09:48:11 +02:00
Niels Lohmann b3e5cb7f20 🔖 set version to 3.9.1 2020-08-06 13:45:29 +02:00
Niels Lohmann e110667d21 🔖 set version to 3.9.0 2020-07-27 15:48:09 +02:00
Niels Lohmann 6bd38a2cb9 👷 merge Gitlab actions 2020-07-22 09:02:55 +02:00
Thomas Braun 25a59b59f2 Github Actions: Add ClangCL on Windows
MS Visual Studio 2019 has builtin support for other compiler toolsets [1].

This commit adds support for compiling using LLVM/Clang 10 using Visual
Studio.

ClangCL pretends to be MSVC so the usual MSVC flags apply, see also [2].
For detecting if ClangCL is used, newer cmake verisons (>= 3.15) have
builtin support using CMAKE_CXX_COMPILER_FRONTEND_VARIANT [3], for older
ones a workaround is available using CMAKE_CXX_SIMULATE_ID [4].

[1]: https://devblogs.microsoft.com/cppblog/clang-llvm-support-in-visual-studio/
[2]: https://clang.llvm.org/docs/UsersManual.html#clang-cl
[3]: https://stackoverflow.com/a/10055571
[4]: https://github.com/microsoft/CMake/commit/4fe34b2d29ca67ea91b2545b223dad8abbcad282
2020-07-14 16:02:44 +02:00
Niels Lohmann dc06f100be Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/json_sax.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/input/parser.hpp
	include/nlohmann/detail/json_pointer.hpp
	include/nlohmann/detail/output/serializer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
2020-07-11 14:04:40 +02:00
Niels Lohmann d019ddfcdb 👷 add code scanning 2020-07-08 12:25:53 +02:00
Niels Lohmann ac3922c7aa Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
2020-06-27 13:14:48 +02:00
Niels Lohmann 5ba0f65c34 🔧 remove feature request template 2020-06-27 12:55:41 +02:00
Niels Lohmann aefa0b3e86 🔧 use Github discussions for questions 2020-06-27 12:54:42 +02:00
Niels Lohmann 24e8562664 👷 remove Clang 8 2020-06-04 12:48:03 +02:00
Niels Lohmann a53e3a5443 👷 try Clang 8 2020-06-04 12:34:56 +02:00
Niels Lohmann dc323314d5 👷 try Clang 10 2020-06-04 12:29:53 +02:00
Niels Lohmann 402c34c526 👷 try Clang 10 2020-06-04 12:27:37 +02:00
Niels Lohmann 9708b1e9c3 🔥 remove Code Inspector 2020-06-03 13:49:46 +02:00
Niels Lohmann 68fd772fdf 👷 add Code Inspector via GitHub Action 2020-06-03 13:44:33 +02:00
Niels Lohmann 9bc2a7fa25 👷 add Code Inspector via GitHub Action 2020-06-03 13:39:56 +02:00
Niels Lohmann 5ea205f570 👷 install clang 2020-05-30 18:17:54 +02:00
Niels Lohmann 5f10d5d156 👷 install clang 2020-05-30 18:15:13 +02:00
Niels Lohmann 7c0c522b96 👷 install clang 2020-05-30 18:11:54 +02:00
Niels Lohmann 522ec5d7bd 👷 install clang 2020-05-30 18:06:52 +02:00
Niels Lohmann 7e5c2a480a 👷 install clang 2020-05-30 18:04:07 +02:00
Niels Lohmann 9c971c2d2f 👷 install clang 2020-05-30 17:40:27 +02:00
Niels Lohmann 4ba8c95794 👷 install clang 2020-05-30 13:41:18 +02:00
Niels Lohmann fbd3e8f677 👷 install clang 2020-05-30 13:35:19 +02:00
Niels Lohmann 0309025b45 👷 set full path 2020-05-30 13:28:44 +02:00
Niels Lohmann 9191926fff 👷 use Makefiles 2020-05-30 13:23:13 +02:00
Niels Lohmann 42ef2a5adb 👷 use Clang compiler 2020-05-30 13:15:56 +02:00
Niels Lohmann 2182935397 👷 add Clang/Windows step 2020-05-30 13:07:23 +02:00
Niels Lohmann bb9619ef8b 📝 request more details in question template 2020-05-27 13:22:34 +02:00
Niels Lohmann 325e8ab8ab 🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Antony Kellermann 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
Niels Lohmann a82c80e9af Merge pull request #2125 from nlohmann/binary_type
Clean up implementation of binary type
2020-05-20 18:58:29 +02:00
Niels Lohmann ae29456b3f 🚸 overwork report templates 2020-05-20 18:57:21 +02:00
Niels Lohmann 4d39644bd0 💚 fix build 2020-05-19 13:45:52 +02:00
Niels Lohmann 5cfa8a586e 👷 run workflows on pull requests 2020-05-18 14:01:54 +02:00
Niels Lohmann 94115a302e 🏁 exclude slow Unicode test 2020-05-12 21:22:47 +02:00
Niels Lohmann 8c44c7b6de 🏁 set Windows CI to Release mode 2020-05-12 21:18:08 +02:00
Niels Lohmann 44a2158b18 👷 make debug build 2020-05-12 20:51:45 +02:00
Niels Lohmann 77e0ba8750 👷 parallelize builds 2020-05-12 20:45:18 +02:00
Niels Lohmann 6e59c8301a 👷 simplify CMake invocations 2020-05-12 20:37:50 +02:00
Niels Lohmann ab02b08296 👷 rename workflows 2020-05-12 20:30:11 +02:00
Niels Lohmann cd76f59af6 👷 add more GitHub actions workflows 2020-05-12 20:26:17 +02:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann a4c01f3380 👥 add GitHub Sponsors 2019-11-22 20:58:44 +01:00
Niels Lohmann f272ad533d 👥 add CODEOWNERS file 2019-10-23 21:41:12 +02:00
Niels Lohmann eab68e7750 👷 add test step 2019-09-02 22:15:11 +02:00
Niels Lohmann 90c1c24ccb 👷 try GitHub Actions 2019-09-02 21:35:53 +02:00
Niels Lohmann a015b78e81 🔒 add security policy 2019-07-28 21:46:32 +02:00