From 9b8c0c9d815abe47d343f79330dceef2a96c1641 Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Fri, 20 Sep 2024 17:32:04 -0400 Subject: [PATCH 1/3] [parallel-hashmap] Bump version to 1.4.0 --- recipes/parallel-hashmap/all/conandata.yml | 15 +++++++++------ recipes/parallel-hashmap/config.yml | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/recipes/parallel-hashmap/all/conandata.yml b/recipes/parallel-hashmap/all/conandata.yml index e810473c6e2e7..2f6821010ba8d 100644 --- a/recipes/parallel-hashmap/all/conandata.yml +++ b/recipes/parallel-hashmap/all/conandata.yml @@ -1,18 +1,21 @@ sources: + "1.4.0": + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.4.0.tar.gz" + sha256: "0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f" "1.3.11": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.11.tar.gz" sha256: "0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f" "1.3.8": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/v1.3.8.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.8.tar.gz" sha256: "c4562ea360dc1dcaddd96a0494c753400364a52c7aa9750de49d8e6a222d28d3" "1.37": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.37.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.37.tar.gz" sha256: "2ac652be0552fcb53a1163c08c1f28f29f0756594fcc587eebb4d8b363153709" "1.36": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.36.tar.gz" sha256: "33acf44158a9661a9d630d13f9250a2aa27a770cb3771df77b1ba1a661c0b766" "1.35": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.35.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.35.tar.gz" sha256: "308ab6f92e4c6f49304562e352890cf7140de85ce723c097e74fbdec88e0e1ce" "1.34": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.34.tar.gz" @@ -21,11 +24,11 @@ sources: url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.33.tar.gz" sha256: "f6e4d0508c4d935fa25dcbaec63fbe0d7503435797e275ec109e8a3f1462a4cd" "1.32": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.32.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.32.tar.gz" sha256: "50cc7abc08f78c6396a33a334e5bc0b3ade121af8604690dae13a1bad47cf07c" "1.31": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.31.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.31.tar.gz" sha256: "1826589041140837f91ab0e3421abbf7e9184454bb83403b5a0359a0bf87bd68" "1.30": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/1.30.tar.gz" + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.30.tar.gz" sha256: "ae14fa41110b5fe211d3f7599318fb1a3e862353c7110cd8370cdc044a98d815" diff --git a/recipes/parallel-hashmap/config.yml b/recipes/parallel-hashmap/config.yml index a8a50d11cadad..0fca4dd286b73 100644 --- a/recipes/parallel-hashmap/config.yml +++ b/recipes/parallel-hashmap/config.yml @@ -1,4 +1,6 @@ versions: + "1.4.0": + folder: all "1.3.11": folder: all "1.3.8": From c0cb89fcd1a3de7a208552ff27a6dd1969a656f3 Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Fri, 20 Sep 2024 17:45:45 -0400 Subject: [PATCH 2/3] Update sha256 and resolve conflicts. --- recipes/parallel-hashmap/all/conandata.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/recipes/parallel-hashmap/all/conandata.yml b/recipes/parallel-hashmap/all/conandata.yml index 2f6821010ba8d..67de1feddcab0 100644 --- a/recipes/parallel-hashmap/all/conandata.yml +++ b/recipes/parallel-hashmap/all/conandata.yml @@ -1,7 +1,10 @@ sources: "1.4.0": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.4.0.tar.gz" - sha256: "0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f" + sha256: "766e05d19c27d9c09e6f9a627868daf451f4fbdd1b617f1bb875fb9402bfb78b" + "1.3.12": + url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.12.tar.gz" + sha256: "0cc203144321924cfbfcc401f42d8204c0dd24e2760c7a1c091baa16d9777c08" "1.3.11": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.11.tar.gz" sha256: "0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f" @@ -23,12 +26,3 @@ sources: "1.33": url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.33.tar.gz" sha256: "f6e4d0508c4d935fa25dcbaec63fbe0d7503435797e275ec109e8a3f1462a4cd" - "1.32": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.32.tar.gz" - sha256: "50cc7abc08f78c6396a33a334e5bc0b3ade121af8604690dae13a1bad47cf07c" - "1.31": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.31.tar.gz" - sha256: "1826589041140837f91ab0e3421abbf7e9184454bb83403b5a0359a0bf87bd68" - "1.30": - url: "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.30.tar.gz" - sha256: "ae14fa41110b5fe211d3f7599318fb1a3e862353c7110cd8370cdc044a98d815" From 1ede3c25332e3d2778cda67f849b73be43d39078 Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Fri, 20 Sep 2024 22:59:08 -0400 Subject: [PATCH 3/3] Fix merge conflict --- recipes/parallel-hashmap/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/parallel-hashmap/config.yml b/recipes/parallel-hashmap/config.yml index 6fddd32419b89..d28a92f6fa7b6 100644 --- a/recipes/parallel-hashmap/config.yml +++ b/recipes/parallel-hashmap/config.yml @@ -1,9 +1,7 @@ versions: -<<<<<<< HEAD "1.4.0": -======= + folder: all "1.3.12": ->>>>>>> c2c5964ace4be2a0905a5503554c7a2642e71e0d folder: all "1.3.11": folder: all