aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2021-04-29 07:39:04 -0700
committerGitHub <noreply@github.com>2021-04-29 07:39:04 -0700
commite6cabdece52f3ffc21cf1101b2c72275cac9dbba (patch)
tree757887f241188668314ec51f62bfb2de6b2419a2 /versions
parent326eabc1917c45d24ee71044cf98b9d1b051cbc6 (diff)
downloadvcpkg-e6cabdece52f3ffc21cf1101b2c72275cac9dbba.tar.gz
vcpkg-e6cabdece52f3ffc21cf1101b2c72275cac9dbba.zip
[ci] Update macOS to 11 (#17376)
* start 2021-04-16 process Major new things: * update to macOS Big Sur (11.*) * switch from VirtualBox to Parallels due to ^ (and also ARM) Minor new things: * update from xcode CLT 12 to 12.4 This PR includes new stuff for creating the base box for parallels. Still to do: using the new box type. * update the vagrantfile stuff * link the CI to the new version * modify how macOS boxes are made the Vagrantfile for the final VM will only download the azure pipeline stuff this allows us to keep the versions of brew applications stable * fix cpus and memory * add vagrant plugins to installables * Skip cppgraphqlgen ICE. * [sdformat6] Remove unneeded include(FindBoost) which causes problems when the system cmake version doesn't match the one deployed by vcpkg. * switch to dmg for installing osxfuse/sshfs * Set cores to 11 (leaving 1 thread for host) Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/s-/sdformat6.json5
2 files changed, 7 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index af1251abb..fb304b2e6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5461,8 +5461,8 @@
"port-version": 0
},
"sdformat6": {
- "baseline": "6.2.0-1",
- "port-version": 0
+ "baseline": "6.2.0",
+ "port-version": 2
},
"sdformat9": {
"baseline": "9.4.0",
diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json
index 04e7f03d8..7a75fc099 100644
--- a/versions/s-/sdformat6.json
+++ b/versions/s-/sdformat6.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "9104c5c84ce079686624adeaa3032543415acda2",
+ "version": "6.2.0",
+ "port-version": 2
+ },
+ {
"git-tree": "5a9a49ae80212912ecf538b7646f233cdba24211",
"version-string": "6.2.0-1",
"port-version": 0