Skip to content

Commit 774fc3b

Browse files
authored
Merge pull request #39 from ednolan/enolan_bumpdependencies1
Bump execution and net dependencies to latest
2 parents 3aae62e + 92be735 commit 774fc3b

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

.github/workflows/ci_tests.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
{"preset": "gcc-release", "image": "ghcr.io/bemanproject/infra-containers-gcc:latest"},
2525
{"preset": "llvm-debug", "image": "ghcr.io/bemanproject/infra-containers-clang:latest"},
2626
{"preset": "llvm-release", "image": "ghcr.io/bemanproject/infra-containers-clang:latest"},
27+
{"preset": "appleclang-debug", "runner": "macos-latest"},
28+
{"preset": "appleclang-release", "runner": "macos-latest"},
2729
{"preset": "msvc-debug", "runner": "windows-latest"},
2830
{"preset": "msvc-release", "runner": "windows-latest"}
2931
]
@@ -46,14 +48,14 @@ jobs:
4648
}
4749
]
4850
},
49-
{ "cxxversions": ["c++23"],
51+
{ "cxxversions": ["c++23", "c++20"],
5052
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5153
}
5254
]
5355
},
5456
{ "versions": ["14", "13"],
5557
"tests": [
56-
{ "cxxversions": ["c++26", "c++23"],
58+
{ "cxxversions": ["c++26", "c++23", "c++20"],
5759
"tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
5860
}
5961
]
@@ -72,7 +74,7 @@ jobs:
7274
}
7375
]
7476
},
75-
{ "cxxversions": ["c++23"],
77+
{ "cxxversions": ["c++23", "c++20"],
7678
"tests": [
7779
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
7880
]
@@ -81,7 +83,7 @@ jobs:
8183
},
8284
{ "versions": ["19", "18"],
8385
"tests": [
84-
{ "cxxversions": ["c++26", "c++23"],
86+
{ "cxxversions": ["c++26", "c++23", "c++20"],
8587
"tests": [
8688
{"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
8789
]
@@ -90,12 +92,21 @@ jobs:
9092
},
9193
{ "versions": ["17"],
9294
"tests": [
93-
{ "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
95+
{ "cxxversions": ["c++26", "c++23", "c++20"],
9496
"tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
9597
}
9698
]
9799
}
98100
],
101+
"appleclang": [
102+
{ "versions": ["latest"],
103+
"tests": [
104+
{ "cxxversions": ["c++26", "c++23", "c++20"],
105+
"tests": [{ "stdlibs": ["libc++"], "tests": ["Release.Default"]}]
106+
}
107+
]
108+
}
109+
],
99110
"msvc": [
100111
{ "versions": ["latest"],
101112
"tests": [
@@ -105,6 +116,13 @@ jobs:
105116
"tests": ["Debug.Default", "Release.Default", "Release.MaxSan"]
106117
}
107118
]
119+
},
120+
{ "cxxversions": ["c++20"],
121+
"tests": [
122+
{ "stdlibs": ["stl"],
123+
"tests": ["Release.Default"]
124+
}
125+
]
108126
}
109127
]
110128
}

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ FetchContent_Declare(
3535
execution
3636
# SOURCE_DIR <path-to>/execution
3737
GIT_REPOSITORY https://github.com/bemanproject/execution
38-
GIT_TAG 578c05
38+
GIT_TAG fa6d441
3939
)
4040
FetchContent_MakeAvailable(execution)
4141
FetchContent_Declare(
4242
net
4343
# SOURCE_DIR <path-to>/net
4444
GIT_REPOSITORY https://github.com/bemanproject/net
45-
GIT_TAG 53a8738
45+
GIT_TAG ea1fd8f
4646
)
4747
if(NOT WIN32)
4848
FetchContent_MakeAvailable(net)

0 commit comments

Comments
 (0)