mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 08:42:39 +01:00 
			
		
		
		
	Set minimum GCC version to 6 (#1820)
This commit is contained in:
		
							
								
								
									
										8
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -33,12 +33,6 @@ jobs: | |||||||
|       fail-fast: false |       fail-fast: false | ||||||
|       matrix: |       matrix: | ||||||
|         include: |         include: | ||||||
|           - gcc: "4.4" |  | ||||||
|           - gcc: "4.6" |  | ||||||
|           - gcc: "4.7" |  | ||||||
|           - gcc: "4.8" |  | ||||||
|           - gcc: "4.9" |  | ||||||
|           - gcc: "5" |  | ||||||
|           - gcc: "6" |           - gcc: "6" | ||||||
|           - gcc: "7" |           - gcc: "7" | ||||||
|             cxxflags: -fsanitize=leak -fno-sanitize-recover=all |             cxxflags: -fsanitize=leak -fno-sanitize-recover=all | ||||||
| @@ -53,8 +47,6 @@ jobs: | |||||||
|       - name: Install |       - name: Install | ||||||
|         run: | |         run: | | ||||||
|           sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32 |           sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32 | ||||||
|           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ trusty main universe' |  | ||||||
|           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main universe' |  | ||||||
|           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main universe' |           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main universe' | ||||||
|           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ focal main universe' |           sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ focal main universe' | ||||||
|           sudo apt-get update |           sudo apt-get update | ||||||
|   | |||||||
| @@ -84,7 +84,7 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things). | |||||||
|     * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x) |     * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x) | ||||||
|     * Continuously tested on |     * Continuously tested on | ||||||
|         * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) |         * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) | ||||||
|         * [GCC 4.4, 4.6, 4.7, 4.8, 4.9, 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) |         * [GCC 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) | ||||||
|         * [Clang 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) |         * [Clang 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) | ||||||
|     * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson) |     * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson) | ||||||
|     * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/) |     * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/) | ||||||
|   | |||||||
| @@ -7,10 +7,6 @@ environment: | |||||||
|       CMAKE_GENERATOR: Visual Studio 16 2019 |       CMAKE_GENERATOR: Visual Studio 16 2019 | ||||||
|     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 |     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 | ||||||
|       CMAKE_GENERATOR: Visual Studio 15 2017 |       CMAKE_GENERATOR: Visual Studio 15 2017 | ||||||
|     - CMAKE_GENERATOR: Ninja |  | ||||||
|       MINGW: MinGW # MinGW 32-bit 5.3.0 |  | ||||||
|     - CMAKE_GENERATOR: Ninja |  | ||||||
|       MINGW32: i686-5.3.0-posix-dwarf-rt_v4-rev0 # MinGW-w64 5.3.0 |  | ||||||
|     - CMAKE_GENERATOR: Ninja |     - CMAKE_GENERATOR: Ninja | ||||||
|       MINGW32: i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0 i686 |       MINGW32: i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0 i686 | ||||||
|     - CMAKE_GENERATOR: Ninja |     - CMAKE_GENERATOR: Ninja | ||||||
|   | |||||||
| @@ -8,9 +8,7 @@ | |||||||
| #  pragma clang diagnostic push | #  pragma clang diagnostic push | ||||||
| #  pragma clang diagnostic ignored "-Wconversion" | #  pragma clang diagnostic ignored "-Wconversion" | ||||||
| #elif defined(__GNUC__) | #elif defined(__GNUC__) | ||||||
| #  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) | #  pragma GCC diagnostic push | ||||||
| #    pragma GCC diagnostic push |  | ||||||
| #  endif |  | ||||||
| #  pragma GCC diagnostic ignored "-Wconversion" | #  pragma GCC diagnostic ignored "-Wconversion" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -133,7 +131,5 @@ TOut convertNumber(TIn value) { | |||||||
| #if defined(__clang__) | #if defined(__clang__) | ||||||
| #  pragma clang diagnostic pop | #  pragma clang diagnostic pop | ||||||
| #elif defined(__GNUC__) | #elif defined(__GNUC__) | ||||||
| #  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) | #  pragma GCC diagnostic pop | ||||||
| #    pragma GCC diagnostic pop |  | ||||||
| #  endif |  | ||||||
| #endif | #endif | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user