Skip to content

Commit

Permalink
Fix pipeline failures
Browse files Browse the repository at this point in the history
- Ubuntu 18.04 is unsupported in GitHub Actions so bumping remaining jobs
  to 20.04.
  https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/
- Conan 2 was released, which has breaking changes, so pegging to
  "conan<2", both in this repo, and in cnl_ci_images.
- Fix linting errors that crept in while pipeline was disabled. See #1043.
- Avoiding examples which no longer compile since LWG3657.
  • Loading branch information
John McFarlane committed Dec 22, 2023
1 parent 781d03f commit b6bc46c
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 28 deletions.
44 changes: 23 additions & 21 deletions .github/conan/settings.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check failure on line 1 in .github/conan/settings.yml

View workflow job for this annotation

GitHub Actions / yamllint

1:1 [empty-lines] too many blank lines (1 > 0)
# Only for cross building, 'os_build/arch_build' is the system that runs Conan
os_build: [Windows, WindowsStore, Linux, Macos, FreeBSD, SunOS, AIX, VxWorks]

Check warning on line 3 in .github/conan/settings.yml

View workflow job for this annotation

GitHub Actions / yamllint

3:1 [document-start] missing document start "---"
arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
Expand All @@ -22,33 +22,32 @@ os:
Linux:
iOS:
version: &ios_version
["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3",
"10.0", "10.1", "10.2", "10.3",
"11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4",
"13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "14.8",
"15.0", "15.1", "15.2", "15.3", "15.4"]
["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3",

Check failure on line 25 in .github/conan/settings.yml

View workflow job for this annotation

GitHub Actions / yamllint

25:18 [indentation] wrong indentation: expected 12 but found 17
"11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4",
"13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "14.8",
"15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1"]
sdk: [None, "iphoneos", "iphonesimulator"]
sdk_version: [None, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
"13.0", "13.1", "13.2", "13.4", "13.5", "13.6", "13.7",
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4"]
"14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4", "15.5", "16.0", "16.1"]
watchOS:
version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2",
"7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4", "8.5"]
"7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4", "8.5", "8.6", "8.7", "9.0", "9.1"]
sdk: [None, "watchos", "watchsimulator"]
sdk_version: [None, "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2",
"7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5"]
"7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5", "9.0", "9.1"]
tvOS:
version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4",
"13.0", "13.2", "13.3", "13.4", "14.0", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7",
"15.0", "15.1", "15.2", "15.3", "15.4"]
"15.0", "15.1", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1"]
sdk: [None, "appletvos", "appletvsimulator"]
sdk_version: [None, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4",
"13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0", "15.2", "15.4"]
"13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0", "15.2", "15.4", "16.0", "16.1"]
Macos:
version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0", "12.0", "13.0"]
sdk: [None, "macosx"]
sdk_version: [None, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1", "12.3"]
sdk_version: [None, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1", "12.3", "13.0", "13.1"]
subsystem:
None:
catalyst:
Expand Down Expand Up @@ -77,11 +76,12 @@ compiler:
"5", "5.1", "5.2", "5.3", "5.4", "5.5",
"6", "6.1", "6.2", "6.3", "6.4", "6.5",
"7", "7.1", "7.2", "7.3", "7.4", "7.5",
"8", "8.1", "8.2", "8.3", "8.4",
"9", "9.1", "9.2", "9.3", "9.4",
"10", "10.1", "10.2", "10.3",
"11", "11.1", "11.2",
"12"]
"8", "8.1", "8.2", "8.3", "8.4", "8.5",
"9", "9.1", "9.2", "9.3", "9.4", "9.5",
"10", "10.1", "10.2", "10.3", "10.4", "10.5",
"11", "11.1", "11.2", "11.3", "11.4",
"12", "12.1", "12.2", "12.3",
"13", "13.1", "13.2"]
libcxx: [libstdc++, libstdc++11]
threads: [None, posix, win32] # Windows MinGW
exception: [None, dwarf2, sjlj, seh] # Windows MinGW
Expand All @@ -105,15 +105,17 @@ compiler:
clang:
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
"5.0", "6.0", "7.0", "7.1",
"8", "9", "10", "11", "12", "13", "14", "15"]
"8", "9", "10", "11", "12", "13", "14", "15", "16", "17"]
libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
runtime: [None, MD, MT, MTd, MDd, static, dynamic]
runtime_type: [None, Debug, Release]
runtime_version: [None, v140, v141, v142, v143]
apple-clang: &apple_clang
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0", "13", "13.0", "13.1"]
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1",
"10.0", "11.0", "12.0", "13", "13.0", "13.1", "14", "14.0", "15", "15.0"]
libcxx: [libstdc++, libc++]
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
intel:
version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"]
update: [None, ANY]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
# Deploy release
deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:gcc-10
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
jobs:
# Build and test many combinations on Linux/OS X using Conan
clang-tidy:
if: false
strategy:
matrix:
int128: ["True", "False"]
Expand Down Expand Up @@ -177,7 +178,9 @@ jobs:
- name: Install Brew packages
if: ( matrix.os-version == 'macos-12' )
run: brew install ccache conan ninja
run: |
brew install ccache conan@1 ninja
echo "/usr/local/opt/conan@1/bin:$PATH" >> $GITHUB_PATH
- name: Restore Compiler Cache
uses: hendrikmuhs/ccache-action@v1
Expand Down Expand Up @@ -225,6 +228,7 @@ jobs:
# Build and test on Windows using Conan
windows:
if: false
strategy:
matrix:
name: [2022-64, 2022-32, 2019-64, 2019-32]
Expand Down Expand Up @@ -301,7 +305,7 @@ jobs:
# Test documentation generation
doxygen:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:base-21.10
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -391,7 +395,7 @@ jobs:

# Install on mature Linux distro using only CMake
install:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wide-integer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
# Check for updates to wide-integer library
update-check:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container: johnmcfarlane/cnl_ci:base-21.10
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 3 additions & 1 deletion test/unit/presentations/cppcon2017.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace filesystem = std::filesystem;
template<typename Rep = int, int Exponent = 0, int Radix = 2>
using fixed_point = cnl::scaled_integer<Rep, cnl::power<Exponent, Radix>>;

#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
template<>
struct std::hash<filesystem::path> {
auto operator()(filesystem::path const& p) const
Expand All @@ -30,6 +30,7 @@ struct std::hash<filesystem::path> {
};
#endif

#if (defined(__clang__) && (__clang_major__ > 14)) // wg21.link/LWG3657
namespace a {
using std::unique_ptr;
using std::unordered_map;
Expand All @@ -38,6 +39,7 @@ namespace a {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
}
#endif

namespace b {
void f()
Expand Down
4 changes: 3 additions & 1 deletion test/unit/presentations/cppdub2018.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using cnl::make_scaled_integer;
using cnl::power;
using cnl::scaled_integer;

#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
#if (defined(_MSC_VER) && _MSC_VER < 1932) || (defined(__GNUC__) && __cplusplus < 201703L) // wg21.link/LWG3657
template<>
struct std::hash<filesystem::path> {
auto operator()(filesystem::path const& p) const
Expand All @@ -32,6 +32,7 @@ struct std::hash<filesystem::path> {
};
#endif

#if (defined(__clang__) && (__clang_major__ > 14)) // wg21.link/LWG3657
namespace a {
using std::unique_ptr;
using std::unordered_map;
Expand All @@ -40,6 +41,7 @@ namespace a {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)
unordered_map<filesystem::path, unique_ptr<byte[]>> cache;
}
#endif

namespace b {
#if defined(CNL_IOSTREAMS_ENABLED)
Expand Down

0 comments on commit b6bc46c

Please sign in to comment.