File tree Expand file tree Collapse file tree 5 files changed +13
-7
lines changed Expand file tree Collapse file tree 5 files changed +13
-7
lines changed Original file line number Diff line number Diff line change 9
9
jobs :
10
10
# Deploy release
11
11
deploy :
12
- runs-on : ubuntu-18 .04
12
+ runs-on : ubuntu-20 .04
13
13
container : johnmcfarlane/cnl_ci:gcc-10
14
14
env :
15
15
GITHUB_TOKEN : ${{secrets.GITHUB_TOKEN}}
Original file line number Diff line number Diff line change 10
10
jobs :
11
11
# Build and test many combinations on Linux/OS X using Conan
12
12
clang-tidy :
13
+ if : false
13
14
strategy :
14
15
matrix :
15
16
int128 : ["True", "False"]
@@ -177,7 +178,7 @@ jobs:
177
178
178
179
- name : Install Brew packages
179
180
if : ( matrix.os-version == 'macos-12' )
180
- run : brew install ccache conan ninja
181
+ run : brew install ccache conan@1 ninja
181
182
182
183
- name : Restore Compiler Cache
183
184
uses : hendrikmuhs/ccache-action@v1
@@ -225,6 +226,7 @@ jobs:
225
226
226
227
# Build and test on Windows using Conan
227
228
windows :
229
+ if : false
228
230
strategy :
229
231
matrix :
230
232
name : [2022-64, 2022-32, 2019-64, 2019-32]
@@ -301,7 +303,7 @@ jobs:
301
303
302
304
# Test documentation generation
303
305
doxygen :
304
- runs-on : ubuntu-18 .04
306
+ runs-on : ubuntu-20 .04
305
307
container : johnmcfarlane/cnl_ci:base-21.10
306
308
steps :
307
309
- uses : actions/checkout@v2
@@ -391,7 +393,7 @@ jobs:
391
393
392
394
# Install on mature Linux distro using only CMake
393
395
install :
394
- runs-on : ubuntu-18 .04
396
+ runs-on : ubuntu-20 .04
395
397
steps :
396
398
- uses : actions/checkout@v2
397
399
Original file line number Diff line number Diff line change 8
8
jobs :
9
9
# Check for updates to wide-integer library
10
10
update-check :
11
- runs-on : ubuntu-18 .04
11
+ runs-on : ubuntu-20 .04
12
12
container : johnmcfarlane/cnl_ci:base-21.10
13
13
steps :
14
14
- uses : actions/checkout@v2
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ namespace filesystem = std::filesystem;
20
20
template <typename Rep = int , int Exponent = 0 , int Radix = 2 >
21
21
using fixed_point = cnl::scaled_integer<Rep, cnl::power<Exponent, Radix>>;
22
22
23
- #if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
23
+ #if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
24
24
template <>
25
25
struct std ::hash<filesystem::path> {
26
26
auto operator ()(filesystem::path const & p) const
@@ -30,6 +30,7 @@ struct std::hash<filesystem::path> {
30
30
};
31
31
#endif
32
32
33
+ #if (defined(__clang__) && (__clang_major__ > 13)) // wg21.link/LWG3657
33
34
namespace a {
34
35
using std::unique_ptr;
35
36
using std::unordered_map;
@@ -38,6 +39,7 @@ namespace a {
38
39
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
39
40
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
40
41
}
42
+ #endif
41
43
42
44
namespace b {
43
45
void f ()
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ using cnl::make_scaled_integer;
22
22
using cnl::power;
23
23
using cnl::scaled_integer;
24
24
25
- #if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
25
+ #if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
26
26
template <>
27
27
struct std ::hash<filesystem::path> {
28
28
auto operator ()(filesystem::path const & p) const
@@ -32,6 +32,7 @@ struct std::hash<filesystem::path> {
32
32
};
33
33
#endif
34
34
35
+ #if (defined(__clang__) && (__clang_major__ > 13)) // wg21.link/LWG3657
35
36
namespace a {
36
37
using std::unique_ptr;
37
38
using std::unordered_map;
@@ -40,6 +41,7 @@ namespace a {
40
41
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
41
42
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
42
43
}
44
+ #endif
43
45
44
46
namespace b {
45
47
#if defined(CNL_IOSTREAMS_ENABLED)
You can’t perform that action at this time.
0 commit comments