Skip to content

Commit bf673b1

Browse files
authored
Merge pull request #1 from BillyONeal/hpx
Fix supports clause and baselines
2 parents 57c0f8a + 82fd628 commit bf673b1

File tree

7 files changed

+12
-15
lines changed

7 files changed

+12
-15
lines changed

ports/hpx/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
],
88
"homepage": "https://github.com/STEllAR-GROUP/hpx",
99
"license": "BSL-1.0",
10-
"supports": "!(windows & x86)",
10+
"supports": "!(windows & arm64) & !(windows & staticcrt)",
1111
"dependencies": [
1212
"asio",
1313
"boost-accumulators",

ports/msmpi/vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "msmpi",
33
"version": "10.1.12498",
4-
"port-version": 4,
4+
"port-version": 5,
55
"description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.",
66
"homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi",
77
"license": "MIT",
8-
"supports": "windows & !uwp"
8+
"supports": "windows & !uwp & (x64 | x86)"
99
}

scripts/ci.baseline.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ hello-imgui:arm-neon-android=fail
423423
hello-imgui:arm64-android=fail
424424
hello-imgui:x64-android=fail
425425
hexl:x64-android=fail
426-
hpx:x64-windows-static=fail
427426
hwloc:arm-neon-android=fail
428427
hwloc:arm64-android=fail
429428
hwloc:x64-android=fail

scripts/ci.feature.baseline.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ graphicsmagick(uwp)=fail
147147
graphqlparser:arm64-osx=fail # python2 required
148148
gsoap = skip # gsoap does not offer stable public source downloads
149149
gtk:x64-windows-static=fail
150-
hpx:arm64-uwp=fail
151-
hpx:arm64-windows-static-md=fail
152-
hpx:arm64-windows=fail
153-
hpx:x64-uwp=fail
154-
hpx:x64-windows-static=fail
155-
hpx[cuda](osx) = cascade
156150
hunspell:x64-windows-static-md=fail
157151
ideviceinstaller:x64-windows-static-md=fail
158152
idevicerestore:x64-linux=fail
@@ -958,10 +952,9 @@ highfive:arm64-uwp = cascade
958952
highfive:arm64-windows = cascade
959953
highfive:x64-uwp = cascade
960954
hikogui:x64-uwp = cascade
961-
hpx:arm64-uwp = cascade
962-
hpx:x64-uwp = cascade
955+
hpx[mpi](windows & !(x64 | x86))=cascade
963956
hpx[cuda](osx) = cascade
964-
hpx[cuda,mpi]:arm64-windows = cascade
957+
hpx[cuda](!(windows & x64 & !uwp & !xbox) & !(linux & x64) & !(linux & arm64)) = cascade
965958
hyperscan:x64-uwp = cascade
966959
hypodermic:arm64-uwp = cascade
967960
hypodermic:x64-uwp = cascade

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6418,7 +6418,7 @@
64186418
},
64196419
"msmpi": {
64206420
"baseline": "10.1.12498",
6421-
"port-version": 4
6421+
"port-version": 5
64226422
},
64236423
"msquic": {
64246424
"baseline": "2.4.8",

versions/h-/hpx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"versions": [
33
{
4-
"git-tree": "53e9382617f3945f750fb550caa6d54e23652b00",
4+
"git-tree": "6ac39e75ba3daa8bce73eac933d71e2905f8472b",
55
"version": "1.11.0",
66
"port-version": 0
77
},

versions/m-/msmpi.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "725c5656745976dabcf479bc5cd0d587a24fe050",
5+
"version": "10.1.12498",
6+
"port-version": 5
7+
},
38
{
49
"git-tree": "d3ccfae00ebdaac2c41fa2acfa59b862171be3ae",
510
"version": "10.1.12498",

0 commit comments

Comments
 (0)