Skip to content

Commit

Permalink
(#25365) glaze: add version 3.4.3 and 3.6.1, remove older versions
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
3 people authored Oct 1, 2024
1 parent 9509903 commit 0261fe2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 40 deletions.
29 changes: 7 additions & 22 deletions recipes/glaze/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
sources:
"3.6.1":
url: "https://github.com/stephenberry/glaze/archive/v3.6.1.tar.gz"
sha256: "70324ad952adee32d6bbf95a0983f0c1623ce61bd237aa28c8337af2d8bb9ed5"
# keep 3.4.3 for breaking change: API(naming) change
"3.4.3":
url: "https://github.com/stephenberry/glaze/archive/v3.4.3.tar.gz"
sha256: "2af1ecc9fbdcb8182d5633979a12b950f6728dd0d76f02affa1e11b1a3369314"
"3.4.1":
url: "https://github.com/stephenberry/glaze/archive/v3.4.1.tar.gz"
sha256: "73a38c4d7731714581061a918b33ad57cf38404abc68d9a58dbe57d56fe26a79"
Expand All @@ -21,29 +28,7 @@ sources:
"2.9.5":
url: "https://github.com/stephenberry/glaze/archive/v2.9.5.tar.gz"
sha256: "67fda0fb0cc701451c261bb1e0c94d63bafaaba13390527521e02a034eff085e"
"2.9.2":
url: "https://github.com/stephenberry/glaze/archive/v2.9.2.tar.gz"
sha256: "8dec57645517cd89631d965ad13888e49ccdb3c037a6bb099fcabadfb093d4fe"
"2.9.0":
url: "https://github.com/stephenberry/glaze/archive/v2.9.0.tar.gz"
sha256: "d07d9cab3d86ee80bf64246c14520d3495027f70444071124ee856dbdf37b6e0"
# keep 2.8.4 for breaking change: pure reflection support for C style arrays
"2.8.4":
url: "https://github.com/stephenberry/glaze/archive/v2.8.4.tar.gz"
sha256: "6ca8e63783f0a1dbe69f50c0bc289134301ecf930ada83489b9715cdd2a49252"
# keep 2.7.0 for breaking change: write error handling
"2.7.0":
url: "https://github.com/stephenberry/glaze/archive/v2.7.0.tar.gz"
sha256: "8e3ee2ba725137cd4f61bc9ceb74e2225dc22b970da1c5a43d2a6833115adbfc"
# keep 2.6.9 for breaking change: JSONC style comment
"2.6.9":
url: "https://github.com/stephenberry/glaze/archive/v2.6.9.tar.gz"
sha256: "e16c221c12b56f5a7f1cb2f33a884e752e219215826d8bc1edf96c78ee2458ec"
# keep 2.6.2 for gcc11
"2.6.2":
url: "https://github.com/stephenberry/glaze/archive/v2.6.2.tar.gz"
sha256: "8498de2b5e80b4eeab07108ea8ed460d4bbfef56f533ff08ca9e119501185dc4"
# Keep 2.1.6 for now as 2.1.7 had some breaking changes
"2.1.6":
url: "https://github.com/stephenberry/glaze/archive/v2.1.6.tar.gz"
sha256: "5ae31b1a48a5b54b84e115a12195341bfbe39f03f92bb3bcad074f984380f72d"
6 changes: 0 additions & 6 deletions recipes/glaze/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ def package_id(self):
self.info.clear()

def validate(self):
# remove this block when all versions of under 2.6.3 will be removed.
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "11.3":
raise ConanInvalidConfiguration(
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)",
)

if self.settings.compiler.get_safe("cppstd"):
check_min_cppstd(self, self._min_cppstd)
minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
Expand Down
16 changes: 4 additions & 12 deletions recipes/glaze/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
versions:
"3.6.1":
folder: all
"3.4.3":
folder: all
"3.4.1":
folder: all
"3.3.4":
Expand All @@ -13,17 +17,5 @@ versions:
folder: all
"2.9.5":
folder: all
"2.9.2":
folder: all
"2.9.0":
folder: all
"2.8.4":
folder: all
"2.7.0":
folder: all
"2.6.9":
folder: all
"2.6.2":
folder: all
"2.1.6":
folder: all

0 comments on commit 0261fe2

Please sign in to comment.