Skip to content

Commit 0261fe2

Browse files
togeErniGHAbrilRBS
authored
(#25365) glaze: add version 3.4.3 and 3.6.1, remove older versions
* glaze: add version 3.4.2 * fix sha256 * update 3.4.3/3.5.0, remove older versions * Remove unneeded check * update 3.6.0 * update 3.6.1 --------- Co-authored-by: Ernesto de Gracia Herranz <[email protected]> Co-authored-by: Abril Rincón Blanco <[email protected]>
1 parent 9509903 commit 0261fe2

File tree

3 files changed

+11
-40
lines changed

3 files changed

+11
-40
lines changed

recipes/glaze/all/conandata.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
sources:
2+
"3.6.1":
3+
url: "https://github.com/stephenberry/glaze/archive/v3.6.1.tar.gz"
4+
sha256: "70324ad952adee32d6bbf95a0983f0c1623ce61bd237aa28c8337af2d8bb9ed5"
5+
# keep 3.4.3 for breaking change: API(naming) change
6+
"3.4.3":
7+
url: "https://github.com/stephenberry/glaze/archive/v3.4.3.tar.gz"
8+
sha256: "2af1ecc9fbdcb8182d5633979a12b950f6728dd0d76f02affa1e11b1a3369314"
29
"3.4.1":
310
url: "https://github.com/stephenberry/glaze/archive/v3.4.1.tar.gz"
411
sha256: "73a38c4d7731714581061a918b33ad57cf38404abc68d9a58dbe57d56fe26a79"
@@ -21,29 +28,7 @@ sources:
2128
"2.9.5":
2229
url: "https://github.com/stephenberry/glaze/archive/v2.9.5.tar.gz"
2330
sha256: "67fda0fb0cc701451c261bb1e0c94d63bafaaba13390527521e02a034eff085e"
24-
"2.9.2":
25-
url: "https://github.com/stephenberry/glaze/archive/v2.9.2.tar.gz"
26-
sha256: "8dec57645517cd89631d965ad13888e49ccdb3c037a6bb099fcabadfb093d4fe"
27-
"2.9.0":
28-
url: "https://github.com/stephenberry/glaze/archive/v2.9.0.tar.gz"
29-
sha256: "d07d9cab3d86ee80bf64246c14520d3495027f70444071124ee856dbdf37b6e0"
3031
# keep 2.8.4 for breaking change: pure reflection support for C style arrays
3132
"2.8.4":
3233
url: "https://github.com/stephenberry/glaze/archive/v2.8.4.tar.gz"
3334
sha256: "6ca8e63783f0a1dbe69f50c0bc289134301ecf930ada83489b9715cdd2a49252"
34-
# keep 2.7.0 for breaking change: write error handling
35-
"2.7.0":
36-
url: "https://github.com/stephenberry/glaze/archive/v2.7.0.tar.gz"
37-
sha256: "8e3ee2ba725137cd4f61bc9ceb74e2225dc22b970da1c5a43d2a6833115adbfc"
38-
# keep 2.6.9 for breaking change: JSONC style comment
39-
"2.6.9":
40-
url: "https://github.com/stephenberry/glaze/archive/v2.6.9.tar.gz"
41-
sha256: "e16c221c12b56f5a7f1cb2f33a884e752e219215826d8bc1edf96c78ee2458ec"
42-
# keep 2.6.2 for gcc11
43-
"2.6.2":
44-
url: "https://github.com/stephenberry/glaze/archive/v2.6.2.tar.gz"
45-
sha256: "8498de2b5e80b4eeab07108ea8ed460d4bbfef56f533ff08ca9e119501185dc4"
46-
# Keep 2.1.6 for now as 2.1.7 had some breaking changes
47-
"2.1.6":
48-
url: "https://github.com/stephenberry/glaze/archive/v2.1.6.tar.gz"
49-
sha256: "5ae31b1a48a5b54b84e115a12195341bfbe39f03f92bb3bcad074f984380f72d"

recipes/glaze/all/conanfile.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ def package_id(self):
5050
self.info.clear()
5151

5252
def validate(self):
53-
# remove this block when all versions of under 2.6.3 will be removed.
54-
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "11.3":
55-
raise ConanInvalidConfiguration(
56-
f"{self.ref} doesn't support 11.0<=gcc<11.3 due to gcc bug. Please use gcc>=11.3 and set compiler.version.(ex. compiler.version=11.3)",
57-
)
58-
5953
if self.settings.compiler.get_safe("cppstd"):
6054
check_min_cppstd(self, self._min_cppstd)
6155
minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)

recipes/glaze/config.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
versions:
2+
"3.6.1":
3+
folder: all
4+
"3.4.3":
5+
folder: all
26
"3.4.1":
37
folder: all
48
"3.3.4":
@@ -13,17 +17,5 @@ versions:
1317
folder: all
1418
"2.9.5":
1519
folder: all
16-
"2.9.2":
17-
folder: all
18-
"2.9.0":
19-
folder: all
2020
"2.8.4":
2121
folder: all
22-
"2.7.0":
23-
folder: all
24-
"2.6.9":
25-
folder: all
26-
"2.6.2":
27-
folder: all
28-
"2.1.6":
29-
folder: all

0 commit comments

Comments
 (0)