aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeorg-emg <71000124+georg-emg@users.noreply.github.com>2021-05-21 10:35:18 +0200
committerGitHub <noreply@github.com>2021-05-21 01:35:18 -0700
commit2f9972005f61f02fa3cda7fc062d1b834b534b8d (patch)
treeced04c5f7ccc972d5bb90ea890ec2267db22678f
parent9c23718d87e217f32ef552029bdc587cfa16c956 (diff)
downloadvcpkg-2f9972005f61f02fa3cda7fc062d1b834b534b8d.tar.gz
vcpkg-2f9972005f61f02fa3cda7fc062d1b834b534b8d.zip
[catch2] updated catch2 to version 2.13.6 (#17435)
* - updated catch2 to version 2.13.6 - replaces catch2 CONTROL file with proper manifest * vcpkg x-add-version catch2 * fixed the portfile to REALLY update catch2 to version 2.13.6 * vcpkg x-add-version catch2 --overwrite-version * fixed the portfile AGAIN to REALLY REALLY update catch2 to version 2.13.6 this time * vcpkg x-add-version catch2 --overwrite-version * updated hash in portfile.cmake for catch2 * vcpkg x-add-version catch2 --overwrite-version * Update version-string as version-semver * Update versions/c-/catch2.json Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
-rw-r--r--ports/catch2/CONTROL5
-rw-r--r--ports/catch2/portfile.cmake4
-rw-r--r--ports/catch2/vcpkg.json6
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/c-/catch2.json5
5 files changed, 15 insertions, 9 deletions
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
deleted file mode 100644
index 3d56f8060..000000000
--- a/ports/catch2/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: catch2
-Version: 2.13.1
-Port-Version: 1
-Description: A modern, header-only test framework for unit testing.
-Homepage: https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index f767f9eec..1d0291a57 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
- REF fd9f5ac661f87335ecd70d39849c1d3a90f1c64d # v2.13.1
- SHA512 4fafd06006034cc02dddd22c381b5817549834dae0aff29ed598edd21a3c67f8ac61a77f51b06f3c59baa96a114ecb19c6df09126215bfc00bef94f8f77b810d
+ REF 5c88067bd339465513af4aec606bd2292f1b594a # v2.13.6
+ SHA512 62ab120ef9cbbcf7320a96654bda60c766dbbcc0d9cbb2b0b36dd04e828315b627caf51e390dcea915efa266655fe0f28058b972c0d6e0e3e457c565d26e1fd3
HEAD_REF master
)
diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
new file mode 100644
index 000000000..ddca8ee67
--- /dev/null
+++ b/ports/catch2/vcpkg.json
@@ -0,0 +1,6 @@
+{
+ "name": "catch2",
+ "version-semver": "2.13.6",
+ "description": "A modern, header-only test framework for unit testing.",
+ "homepage": "https://github.com/catchorg/Catch2"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index a0a1a9547..3123d2253 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1129,8 +1129,8 @@
"port-version": 0
},
"catch2": {
- "baseline": "2.13.1",
- "port-version": 1
+ "baseline": "2.13.6",
+ "port-version": 0
},
"cccapstone": {
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 0edb437e7..a9aa348e9 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5",
+ "version-semver": "2.13.6",
+ "port-version": 0
+ },
+ {
"git-tree": "47ba2c2a9ed12b317550ed102374cd13554fe9ac",
"version-string": "2.13.1",
"port-version": 1