Update ci.yml

Merge pull request #4 from ecatmur/gcc-13
Also suppress Wself-move under gcc 13
2026-01-24 17:52:32 +00:00 · 2023-08-29 11:57:33 +03:00 · 2023-08-29 02:50:54 +03:00 · 2023-08-28 15:51:11 -05:00 · 2023-08-15 19:15:46 -05:00
2 changed files with 25 additions and 3 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,11 @@ jobs:
            cxxstd: "03,11,14,17,20,2b"
            os: ubuntu-22.04
            install: g++-12
+          - toolset: gcc-13
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-latest
+            container: ubuntu:23.04
+            install: g++-13
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "03,11,14"
@@ -123,12 +128,21 @@ jobs:
            cxxstd: "03,11,14,17,20,2b"
            os: ubuntu-22.04
            install: clang-15
+          - toolset: clang
+            compiler: clang++-16
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-latest
+            container: ubuntu:23.04
+            install: clang-16
          - toolset: clang
            cxxstd: "03,11,14,17,2a"
            os: macos-11
          - toolset: clang
            cxxstd: "03,11,14,17,20,2b"
            os: macos-12
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-13

    runs-on: ${{matrix.os}}
    container: ${{matrix.container}}
@@ -144,11 +158,13 @@ jobs:
        if: matrix.container
        run: |
          apt-get update
-          apt-get -y install sudo python git g++
+          apt-get -y install sudo python3 git g++

      - name: Install packages
        if: matrix.install
-        run: sudo apt-get -y install ${{matrix.install}}
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ${{matrix.install}}

      - name: Setup Boost
        run: |
@@ -169,7 +185,7 @@ jobs:
          mkdir -p libs/$LIBRARY
          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
          ./bootstrap.sh
          ./b2 -d0 headers

@@ -251,6 +267,7 @@ jobs:
          - os: ubuntu-22.04
          - os: macos-11
          - os: macos-12
+          - os: macos-13

    runs-on: ${{matrix.os}}

@@ -299,6 +316,7 @@ jobs:
          - os: ubuntu-22.04
          - os: macos-11
          - os: macos-12
+          - os: macos-13

    runs-on: ${{matrix.os}}

@@ -357,6 +375,7 @@ jobs:
          - os: ubuntu-22.04
          - os: macos-11
          - os: macos-12
+          - os: macos-13

    runs-on: ${{matrix.os}}

--- a/test/shared_lock_test.cpp
+++ b/test/shared_lock_test.cpp
@@ -23,6 +23,9 @@
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wself-move"
 #endif
+#if defined(__GNUC__) && __GNUC__ >= 13
+#pragma GCC diagnostic ignored "-Wself-move"
+#endif

 struct invalid_lock_use: public std::runtime_error
 {
Author	SHA1	Message	Date
Peter Dimov	0008d02a62	Update ci.yml	2023-08-29 11:57:33 +03:00
Peter Dimov	0387e8afe1	Merge pull request #4 from ecatmur/gcc-13 Also suppress Wself-move under gcc 13	2023-08-29 02:50:54 +03:00
Ed Catmur	6292106e68	Update shared_lock_test.cpp	2023-08-28 15:51:11 -05:00
Ed Catmur	8f75ad2a75	Also suppress Wself-move under gcc 13 Compiling with gcc 13.1.0: ../libs/compat/test/shared_lock_test.cpp: In function 'void {anonymous}::move_assignment()': ../libs/compat/test/shared_lock_test.cpp:378:10: error: moving 'lock' of type '{anonymous}::shared_lock_type' {aka 'boost::compat::shared_lock<dummy_lock>'} to itself [-Werror=self-move] 378 \| lock = std::move( lock ); \| ~~~~~^~~~~~~~~~~~~~~~~~~ ../libs/compat/test/shared_lock_test.cpp:378:10: note: remove 'std::move' call cc1plus: all warnings being treated as errors	2023-08-15 19:15:46 -05:00