aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2021-04-29 05:42:15 +0800
committerGitHub <noreply@github.com>2021-04-28 14:42:15 -0700
commit05d29d04b995cc006911f74dc93bf9a16964d85a (patch)
treee0a9dedb384470d891de49ca55b6ae94f3741c3b
parentd0f18bbccdbdd96a08d0f78a93cbf2d6aef4c1e0 (diff)
downloadvcpkg-05d29d04b995cc006911f74dc93bf9a16964d85a.tar.gz
vcpkg-05d29d04b995cc006911f74dc93bf9a16964d85a.zip
[marl] update to latest version (#17459)
* [marl] update to 2021-2-19 * update version * update vcpkg-json * update json file * update version * [marl] update to 2021-04-25 * update version * Update vcpkg.json * Update baseline.json * update version
-rw-r--r--ports/marl/portfile.cmake4
-rw-r--r--ports/marl/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/m-/marl.json5
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/marl/portfile.cmake b/ports/marl/portfile.cmake
index 0c1a8df59..53e13ef79 100644
--- a/ports/marl/portfile.cmake
+++ b/ports/marl/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/marl
- REF f1c446ccdc0c611d1aeec4a6266a77693ae48c92
- SHA512 3cbe911ddc42c1996ad467958d1e3b34080a49965c3c7ce3408f59039f477c660df323cf1aa9d55447e6f54c23fd2cb19f149b722a1b66836e24bd3368fa4f46
+ REF 4c1b662da7d7a35f0fba9156a08cb49d129f5189 #2021-04-25
+ SHA512 a3f8f65ef870075fac96dc67e8efbbe62596787a623aab02509c34f80a7cae523412d4bf94450c400a4637a0fffee6ef0cbf8f38286707e9d001e628cc11177f
HEAD_REF main
)
diff --git a/ports/marl/vcpkg.json b/ports/marl/vcpkg.json
index 7d1438e27..30c2aa240 100644
--- a/ports/marl/vcpkg.json
+++ b/ports/marl/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "marl",
- "version-string": "2020-10-10",
+ "version-date": "2021-04-25",
"description": "A hybrid thread/fiber task scheduler written in modern C++",
"homepage": "https://github.com/google/marl",
"license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index bc9878416..90500ff2c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3829,7 +3829,7 @@
"port-version": 2
},
"marl": {
- "baseline": "2020-10-10",
+ "baseline": "2021-04-25",
"port-version": 0
},
"mathc": {
diff --git a/versions/m-/marl.json b/versions/m-/marl.json
index e1d008e43..0b62afa36 100644
--- a/versions/m-/marl.json
+++ b/versions/m-/marl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "455a779684efcee90811a7a1d2a86ba1b29a8996",
+ "version-date": "2021-04-25",
+ "port-version": 0
+ },
+ {
"git-tree": "1bbc3159a32ef547939ca19e4369fb3b4d87b381",
"version-string": "2020-10-10",
"port-version": 0