Peter M. Groen / CLI11

Commit b440890eaf29d526e13997f67c2e0288c7c3c60f

Authored by Henry Schreiner
Committed by GitHub
1 parent 41019640

docs: changelog update (#643) 

* docs: changelog update

* chore: bump version(s)

* style: pre-commit.ci fixes

* docs: spelling fix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Inline Side-by-side
Showing 6 changed files with 59 additions and 76 deletions
.appveyor.yml
  View file @b440890
1   -version: 2.1.0.{build}
  1 +version: 2.1.1.{build}
2 2  
3 3 branches:
4 4 only:
... ...
.github/actions/quick_cmake/action.yml
  View file @b440890
... ... @@ -5,14 +5,21 @@ inputs:
5 5 description: 'Other arguments'
6 6 required: false
7 7 default: ''
  8 + cmake-version:
  9 + description: 'The CMake version to run'
  10 + required: true
8 11  
9 12 runs:
10 13 using: composite
11 14 steps:
  15 + - name: CMake ${{ inputs.cmake-version }}
  16 + uses: jwlawson/actions-setup-cmake@v1.11
  17 + with:
  18 + cmake-version: "${{ inputs.cmake-version }}"
12 19 - run: |
13 20 mkdir -p build-tmp
14 21 touch build-tmp/tmp
15 22 rm -r build-tmp/*
16   - (cd build-tmp && cmake .. ${{ inputs.args}})
  23 + (cd build-tmp && cmake .. ${{ inputs.args }})
17 24 rm -r build-tmp
18 25 shell: bash
... ...
.github/workflows/tests.yml
  View file @b440890
... ... @@ -40,141 +40,111 @@ jobs:
40 40 steps:
41 41 - uses: actions/checkout@v2
42 42  
43   - - name: CMake 3.4
44   - uses: jwlawson/actions-setup-cmake@v1.11
  43 + - name: Check CMake 3.4
45 44 with:
46 45 cmake-version: "3.4"
47   - - name: Check CMake 3.4
48 46 uses: ./.github/actions/quick_cmake
49 47  
50   - - name: CMake 3.5
51   - uses: jwlawson/actions-setup-cmake@v1.11
52   - with:
53   - cmake-version: "3.5"
54 48 - name: Check CMake 3.5
55 49 uses: ./.github/actions/quick_cmake
  50 + with:
  51 + cmake-version: "3.5"
56 52 if: success() || failure()
57 53  
58   - - name: CMake 3.6
59   - uses: jwlawson/actions-setup-cmake@v1.11
60   - with:
61   - cmake-version: "3.6"
62 54 - name: Check CMake 3.6
63 55 uses: ./.github/actions/quick_cmake
  56 + with:
  57 + cmake-version: "3.6"
64 58 if: success() || failure()
65 59  
66   - - name: CMake 3.7
67   - uses: jwlawson/actions-setup-cmake@v1.11
68   - with:
69   - cmake-version: "3.7"
70 60 - name: Check CMake 3.7
71 61 uses: ./.github/actions/quick_cmake
  62 + with:
  63 + cmake-version: "3.7"
72 64 if: success() || failure()
73 65  
74   - - name: CMake 3.8
75   - uses: jwlawson/actions-setup-cmake@v1.11
76   - with:
77   - cmake-version: "3.8"
78 66 - name: Check CMake 3.8
79 67 uses: ./.github/actions/quick_cmake
  68 + with:
  69 + cmake-version: "3.8"
80 70 if: success() || failure()
81 71  
82   - - name: CMake 3.9
83   - uses: jwlawson/actions-setup-cmake@v1.11
84   - with:
85   - cmake-version: "3.9"
86 72 - name: Check CMake 3.9
87 73 uses: ./.github/actions/quick_cmake
  74 + with:
  75 + cmake-version: "3.9"
88 76 if: success() || failure()
89 77  
90   - - name: CMake 3.10
91   - uses: jwlawson/actions-setup-cmake@v1.11
92   - with:
93   - cmake-version: "3.10"
94 78 - name: Check CMake 3.10
95 79 uses: ./.github/actions/quick_cmake
  80 + with:
  81 + cmake-version: "3.10"
96 82 if: success() || failure()
97 83  
98   - - name: CMake 3.11
99   - uses: jwlawson/actions-setup-cmake@v1.11
100   - with:
101   - cmake-version: "3.11"
102 84 - name: Check CMake 3.11 (full)
103 85 uses: ./.github/actions/quick_cmake
104 86 with:
  87 + cmake-version: "3.11"
105 88 args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
106 89 if: success() || failure()
107 90  
108   - - name: CMake 3.12
109   - uses: jwlawson/actions-setup-cmake@v1.11
110   - with:
111   - cmake-version: "3.12"
112 91 - name: Check CMake 3.12
113 92 uses: ./.github/actions/quick_cmake
  93 + with:
  94 + cmake-version: "3.12"
114 95 if: success() || failure()
115 96  
116   - - name: CMake 3.13
117   - uses: jwlawson/actions-setup-cmake@v1.11
118   - with:
119   - cmake-version: "3.13"
120 97 - name: Check CMake 3.13
121 98 uses: ./.github/actions/quick_cmake
  99 + with:
  100 + cmake-version: "3.13"
122 101 if: success() || failure()
123 102  
124   - - name: CMake 3.14
125   - uses: jwlawson/actions-setup-cmake@v1.11
126   - with:
127   - cmake-version: "3.14"
128 103 - name: Check CMake 3.14
129 104 uses: ./.github/actions/quick_cmake
  105 + with:
  106 + cmake-version: "3.14"
130 107 if: success() || failure()
131 108  
132   - - name: CMake 3.15
133   - uses: jwlawson/actions-setup-cmake@v1.11
134   - with:
135   - cmake-version: "3.15"
136 109 - name: Check CMake 3.15
137 110 uses: ./.github/actions/quick_cmake
  111 + with:
  112 + cmake-version: "3.15"
138 113 if: success() || failure()
139 114  
140   - - name: CMake 3.16
141   - uses: jwlawson/actions-setup-cmake@v1.11
142   - with:
143   - cmake-version: "3.16"
144 115 - name: Check CMake 3.16
145 116 uses: ./.github/actions/quick_cmake
  117 + with:
  118 + cmake-version: "3.16"
146 119 if: success() || failure()
147 120  
148   - - name: CMake 3.17
149   - uses: jwlawson/actions-setup-cmake@v1.11
150   - with:
151   - cmake-version: "3.17"
152 121 - name: Check CMake 3.17
153 122 uses: ./.github/actions/quick_cmake
  123 + with:
  124 + cmake-version: "3.17"
154 125 if: success() || failure()
155 126  
156   - - name: CMake 3.18
157   - uses: jwlawson/actions-setup-cmake@v1.11
158   - with:
159   - cmake-version: "3.18"
160 127 - name: Check CMake 3.18
161 128 uses: ./.github/actions/quick_cmake
  129 + with:
  130 + cmake-version: "3.18"
162 131 if: success() || failure()
163 132  
164   - - name: CMake 3.19
165   - uses: jwlawson/actions-setup-cmake@v1.11
166   - with:
167   - cmake-version: "3.19"
168   - - name: Check CMake 3.19 (full)
  133 + - name: Check CMake 3.19
169 134 uses: ./.github/actions/quick_cmake
170 135 with:
171   - args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
  136 + cmake-version: "3.19"
172 137 if: success() || failure()
173 138  
174   - - name: CMake 3.20
175   - uses: jwlawson/actions-setup-cmake@v1.11
  139 + - name: Check CMake 3.20
  140 + uses: ./.github/actions/quick_cmake
176 141 with:
177 142 cmake-version: "3.20"
178   - - name: Check CMake 3.20
  143 + if: success() || failure()
  144 +
  145 + - name: Check CMake 3.21 (full)
179 146 uses: ./.github/actions/quick_cmake
  147 + with:
  148 + cmake-version: "3.21"
  149 + args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
180 150 if: success() || failure()
... ...
CHANGELOG.md
  View file @b440890
... ... @@ -23,6 +23,12 @@ is not passed, or every time the option is parsed.
23 23 [#633]: https://github.com/CLIUtils/CLI11/pull/633
24 24 [#635]: https://github.com/CLIUtils/CLI11/pull/635
25 25  
  26 +### Version 2.1.1: Quick Windows fix
  27 +
  28 +* A collision with `min`/`max` macros on Windows has been fixed. [#642][]
  29 +
  30 +[#642]: https://github.com/CLIUtils/CLI11/pull/642
  31 +
26 32 ## Version 2.0: Simplification
27 33  
28 34 This version focuses on cleaning up deprecated functionality, and some minor
... ...
CMakeLists.txt
  View file @b440890
... ... @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.4)
2 2 # Note: this is a header only library. If you have an older CMake than 3.4,
3 3 # just add the CLI11/include directory and that's all you need to do.
4 4  
5   -# Make sure users don't get warnings on a tested (3.4 to 3.20) version
  5 +# Make sure users don't get warnings on a tested (3.4 to 3.21) version
6 6 # of CMake. For most of the policies, the new version is better (hence the change).
7   -# We don't use the 3.4...3.20 syntax because of a bug in an older MSVC's
  7 +# We don't use the 3.4...3.21 syntax because of a bug in an older MSVC's
8 8 # built-in and modified CMake 3.11
9   -if(${CMAKE_VERSION} VERSION_LESS 3.20)
  9 +if(${CMAKE_VERSION} VERSION_LESS 3.21)
10 10 cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
11 11 else()
12   - cmake_policy(VERSION 3.20)
  12 + cmake_policy(VERSION 3.21)
13 13 endif()
14 14  
15 15 set(VERSION_REGEX "#define CLI11_VERSION[ \t]+\"(.+)\"")
... ...
include/CLI/Version.hpp
  View file @b440890
... ... @@ -10,7 +10,7 @@
10 10  
11 11 #define CLI11_VERSION_MAJOR 2
12 12 #define CLI11_VERSION_MINOR 1
13   -#define CLI11_VERSION_PATCH 0
14   -#define CLI11_VERSION "2.1.0"
  13 +#define CLI11_VERSION_PATCH 1
  14 +#define CLI11_VERSION "2.1.1"
15 15  
16 16 // [CLI11:version_hpp:end]
... ...