From 639c1ed89cf24bdbad5ae2a2255052ddb8f4b602 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 10:30:45 -0800 Subject: [PATCH 1/6] Update action versions --- .github/workflows/cmake.yml | 5 ++--- src/config_reader_example.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8186ded9..cdded06c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -53,8 +53,7 @@ jobs: CXX: clang++ steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | @@ -111,7 +110,7 @@ jobs: # This must happen before the "Configure CMake" step otherwise the python version used to compile # will be different than the one installed here. - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: '3.10' cache: 'pip' diff --git a/src/config_reader_example.cpp b/src/config_reader_example.cpp index 947f83cb..486d0010 100644 --- a/src/config_reader_example.cpp +++ b/src/config_reader_example.cpp @@ -121,7 +121,7 @@ auto main(int argc, char* argv[]) -> int { // Read a deeply nested set of lists const auto my_nested_list_key = "outer.deep_multi_list"; const auto out = cfg.getValue>>>(my_nested_list_key); - fmt::print("Value of '{}' is : \n", my_nested_list_key); // , fmt::join(out, ", ")); + fmt::print("Value of '{}' is : \n", my_nested_list_key); // , fmt::join(out, ", ")); for (const auto& v0 : out) { fmt::print("["); for (const auto& v1 : v0) { From 6374674bc11ef0adbb5effa02d4d16fd6fb09225 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 10:45:13 -0800 Subject: [PATCH 2/6] Add clang-15 on 22.04 to the build matrix --- .github/workflows/cmake.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cdded06c..d94e6f2b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -27,6 +27,7 @@ jobs: ubuntu-latest-gcc-12, ubuntu-20.04-clang-13, ubuntu-22.04-clang-14, + ubuntu-22.04-clang-15, mac-os-latest ] @@ -47,6 +48,11 @@ jobs: compiler: clang version: "14" + - name: ubuntu-22.04-clang-15 + os: ubuntu-22.04 + compiler: clang + version: "15" + - name: mac-os-latest os: macos-latest CC: clang From 2ecb50a78e544a5af63966641bdfc0e611b28ac4 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 14:19:19 -0800 Subject: [PATCH 3/6] hack to fix https://github.com/actions/runner-images/issues/8659 --- .github/workflows/cmake.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d94e6f2b..cb73c934 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -91,6 +91,19 @@ jobs: echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV else + + # Workaround https://github.com/actions/runner-images/issues/8659 + if [ "${{ matrix.name }}" = "ubuntu-22.04-clang-14"]; then + sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list + sudo apt-get update + sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 \ + libc6-dev=2.35-0ubuntu3.4 \ + libstdc++6=12.3.0-1ubuntu1~22.04 \ + libgcc-s1=12.3.0-1ubuntu1~22.04 + fi + + + sudo apt-get install -y clang-${{ matrix.version }} g++-multilib echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV From aaeef57be228388ca757896f90470ad9a23b3fe8 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 14:28:12 -0800 Subject: [PATCH 4/6] Try again? --- .github/workflows/cmake.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cb73c934..1a852aa4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -64,6 +64,20 @@ jobs: - name: Install dependencies run: | if [ "${{ runner.os }}" = "Linux" ]; then + + # Workaround https://github.com/actions/runner-images/issues/8659 + echo "matrix.name=${{ matrix.name }}" + echo "matrix.os=${{ matrix.os }}" + if [ "${{ matrix.name }}" = "ubuntu-22.04-clang-14" || "${{ matrix.os }}" = "ubuntu-latest"]; then + echo "Workaround for https://github.com/actions/runner-images/issues/8659" + sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list + sudo apt-get update + sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 \ + libc6-dev=2.35-0ubuntu3.4 \ + libstdc++6=12.3.0-1ubuntu1~22.04 \ + libgcc-s1=12.3.0-1ubuntu1~22.04 + fi + wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - # Figure out which version of ubuntu is actually running @@ -91,19 +105,6 @@ jobs: echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV else - - # Workaround https://github.com/actions/runner-images/issues/8659 - if [ "${{ matrix.name }}" = "ubuntu-22.04-clang-14"]; then - sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list - sudo apt-get update - sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 \ - libc6-dev=2.35-0ubuntu3.4 \ - libstdc++6=12.3.0-1ubuntu1~22.04 \ - libgcc-s1=12.3.0-1ubuntu1~22.04 - fi - - - sudo apt-get install -y clang-${{ matrix.version }} g++-multilib echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV From 50d9f91962f5e878fcddd3a69c84c85062455ee7 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 14:31:06 -0800 Subject: [PATCH 5/6] try again --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1a852aa4..ed60b7d7 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -68,7 +68,7 @@ jobs: # Workaround https://github.com/actions/runner-images/issues/8659 echo "matrix.name=${{ matrix.name }}" echo "matrix.os=${{ matrix.os }}" - if [ "${{ matrix.name }}" = "ubuntu-22.04-clang-14" || "${{ matrix.os }}" = "ubuntu-latest"]; then + if [[ "${{ matrix.name }}" = "ubuntu-22.04-clang-14" ]] || [[ "${{ matrix.os }}" = "ubuntu-latest"]]; then echo "Workaround for https://github.com/actions/runner-images/issues/8659" sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list sudo apt-get update From ec04ca8ca23b1c96f6d5dc28e8b3c54126284947 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 7 Nov 2023 14:33:19 -0800 Subject: [PATCH 6/6] 18th time is the charm? --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ed60b7d7..3051bf09 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -68,7 +68,7 @@ jobs: # Workaround https://github.com/actions/runner-images/issues/8659 echo "matrix.name=${{ matrix.name }}" echo "matrix.os=${{ matrix.os }}" - if [[ "${{ matrix.name }}" = "ubuntu-22.04-clang-14" ]] || [[ "${{ matrix.os }}" = "ubuntu-latest"]]; then + if [[ "${{ matrix.name }}" = "ubuntu-22.04-clang-14" ]] || [[ "${{ matrix.os }}" = "ubuntu-latest" ]] ; then echo "Workaround for https://github.com/actions/runner-images/issues/8659" sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list sudo apt-get update