Merge branch 'main' into reordering

Author: danlapid

.github/workflows/cmake.yml

@@ -1,6 +1,10 @@
 name: CMake
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   build:
@@ -17,15 +21,15 @@ jobs:
         config:
           - {
             name: "Linux g++ 10.2 C++17",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "g++-10",
             cxxver: 17,
             generator: "Unix Makefiles",
           }
           - {
             name: "Linux g++ 10.2 C++20",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "g++-10",
             cxxver: 20,
@@ -49,20 +53,48 @@ jobs:
           }
           - {
             name: "Linux g++ 11 C++17",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Debug,
             cxx: "g++-11",
             cxxver: 17,
             generator: "Unix Makefiles",
           }
           - {
             name: "Linux g++ 11 C++20",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "g++-11",
             cxxver: 20,
             generator: "Unix Makefiles",
           }
+          - {
+            name: "Linux g++ 12 C++17",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "g++-12",
+            cxxver: 17,
+          }
+          - {
+            name: "Linux g++ 12 C++20",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "g++-12",
+            cxxver: 20,
+          }
+          - {
+            name: "Linux g++ 13 C++17",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "g++-13",
+            cxxver: 17,
+          }
+          - {
+            name: "Linux g++ 13 C++20",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "g++-13",
+            cxxver: 20,
+          }
           - {
             name: "Linux clang-10 C++17",
             os: ubuntu-20.04,
@@ -125,7 +157,7 @@ jobs:
           }
           - {
             name: "Linux clang-13 C++17",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-13",
             cxx_flags: -stdlib=libc++,
@@ -135,7 +167,7 @@ jobs:
           }
           - {
             name: "Linux clang-13 C++20",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-13",
             cxx_flags: -stdlib=libc++,
@@ -145,7 +177,7 @@ jobs:
           }
           - {
             name: "Linux clang-14 C++17",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-14",
             cxx_flags: -stdlib=libc++,
@@ -155,7 +187,7 @@ jobs:
           }
           - {
             name: "Linux clang-14 C++20",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-14",
             cxx_flags: -stdlib=libc++,
@@ -165,7 +197,7 @@ jobs:
           }
           - {
             name: "Linux clang-15 C++17 Debug",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Debug,
             cxx: "clang++-15",
             cxx_flags: -stdlib=libc++,
@@ -175,7 +207,7 @@ jobs:
           }
           - {
             name: "Linux clang-15 C++20 Debug",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Debug,
             cxx: "clang++-15",
             cxx_flags: -stdlib=libc++,
@@ -185,7 +217,7 @@ jobs:
           }
           - {
             name: "Linux clang-15 C++17",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-15",
             cxx_flags: -stdlib=libc++,
@@ -195,14 +227,32 @@ jobs:
           }
           - {
             name: "Linux clang-15 C++20",
-            os: ubuntu-20.04,
+            os: ubuntu-22.04,
             buildtype: Release,
             cxx: "clang++-15",
             cxx_flags: -stdlib=libc++,
             exe_linker_flags: -lc++,
             cxxver: 20,
             generator: "Unix Makefiles",
           }
+          - {
+            name: "Linux clang-16 C++17",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "clang++-16",
+            cxx_flags: -stdlib=libc++,
+            exe_linker_flags: -lc++,
+            cxxver: 17,
+          }
+          - {
+            name: "Linux clang-16 C++20",
+            os: ubuntu-22.04,
+            buildtype: Release,
+            cxx: "clang++-16",
+            cxx_flags: -stdlib=libc++,
+            exe_linker_flags: -lc++,
+            cxxver: 20,
+          }
           - {
             name: "Windows MSVC 2017 (x64) C++17",
             os: windows-2019,
@@ -355,9 +405,58 @@ jobs:
             cxxver: 20,
             generator: "Unix Makefiles",
           }
+          - {
+            name: "Msys2/CLANG",
+            os: windows-2019,
+            buildtype: Release,
+            mingw: MINGW64,
+            mingw-arch: x86_64,
+            cxx: "clang",
+            cxxver: 20,
+          }
+          - {
+            name: "Msys2/GCC",
+            os: windows-2019,
+            buildtype: Release,
+            mingw: MINGW64,
+            mingw-arch: x86_64,
+            cxx: "gcc",
+            cxxver: 20,
+          }
+          - {
+            name: "Msys2/debugCLANG",
+            os: windows-2019,
+            buildtype: Debug,
+            mingw: MINGW64,
+            mingw-arch: x86_64,
+            cxx: "clang",
+            cxxver: 17,
+          }
+          - {
+            name: "Msys2/debugGCC",
+            os: windows-2019,
+            buildtype: Debug,
+            mingw: MINGW64,
+            mingw-arch: x86_64,
+            cxx: "gcc",
+            cxxver: 17,
+          }
 
     steps:
     - uses: actions/checkout@v3
+    
+    - name: "Install Msys2"
+      if: (startsWith(matrix.config.os, 'windows-2019') && contains(matrix.config.mingw, 'MINGW'))
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.config.mingw }}
+        install: >-
+          git
+          mingw-w64-${{ matrix.config.mingw-arch }}-cmake
+          mingw-w64-${{ matrix.config.mingw-arch }}-ninja
+          mingw-w64-${{ matrix.config.mingw-arch }}-${{ matrix.config.cxx }}
+          mingw-w64-${{ matrix.config.mingw-arch }}-toolchain
+        update: true
 
     - name: Install Clang 10
       id: install_clang_10
@@ -425,6 +524,17 @@ jobs:
         sudo ./llvm.sh 15
         sudo apt-get install libc++-15-dev libc++abi-15-dev libunwind-15-dev
 
+    - name: Install Clang 16
+      id: install_clang_16
+      if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-16' )
+      shell: bash
+      working-directory: ${{ env.HOME }}
+      run: |
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 16
+        sudo apt-get install libc++-16-dev libc++abi-16-dev libunwind-16-dev
+
     - name: Install g++ 10
       id: install_gcc_10
       if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-10' )
@@ -443,6 +553,23 @@ jobs:
         sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
         sudo apt-get install g++-11
 
+    - name: Install g++ 12
+      id: install_gcc_12
+      if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-12' )
+      shell: bash
+      working-directory: ${{ env.HOME }}
+      run: |
+        sudo apt-get install g++-12
+
+    - name: Install g++ 13
+      id: install_gcc_13
+      if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-13' )
+      shell: bash
+      working-directory: ${{ env.HOME }}
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+        sudo apt-get install g++-13
+
     - name: Install MSVC 2017
       id: install_msvc_2017
       if: startsWith(matrix.config.os, 'windows-2019') && ( matrix.config.cxx == 'cl' ) && ( matrix.config.msvcver == 2017 )
@@ -472,13 +599,30 @@ jobs:
         choco uninstall strawberryperl --force
         choco install mingw --version=11.2.0.07112021
         choco install make
+        
+    - name: MSYS2 - Configure, Build & Test
+      id: install_msys2
+      if: (startsWith(matrix.config.os, 'windows-2019') && contains(matrix.config.mingw, 'MINGW'))
+      shell: msys2 {0}
+      working-directory: ${{ env.HOME }}
+      run: |
+            cmake $GITHUB_WORKSPACE \
+            -DCMAKE_BUILD_TYPE=${{ matrix.config.buildtype }} \
+            -DCMAKE_CXX_STANDARD=${{ matrix.config.cxxver }} \
+            -DBUILD_TESTING=ON \
+            -DCMAKE_CXX_FLAGS=${{ matrix.config.cxx_flags }} \
+            -DCMAKE_EXE_LINKER_FLAGS=${{ matrix.config.exe_linker_flags }} \
+            -DCMAKE_VERBOSE_MAKEFILE=ON
+            cmake --build . --config ${{ matrix.config.buildtype }}
+            ctest --output-on-failure -C ${{ matrix.config.buildtype }}
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
       run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake
+      if: (!contains(matrix.config.mingw, 'MINGW'))
       # Use a bash shell so we can use the same syntax for environment variable
       # access regardless of the host operating system
       shell: bash
@@ -502,12 +646,14 @@ jobs:
           -DCMAKE_VERBOSE_MAKEFILE=ON
 
     - name: Build
+      if: (!contains(matrix.config.mingw, 'MINGW'))
       working-directory: ${{runner.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config ${{ matrix.config.buildtype }}
 
     - name: Test
+      if: (!contains(matrix.config.mingw, 'MINGW'))
       working-directory: ${{runner.workspace}}/build
       shell: bash
       # Execute tests defined by the CMake configuration.

README.md

@@ -9,7 +9,7 @@ library. The differences to the original cppcoro are:
 * CMake as build system instead of cake.
 * CI in Github actions instead of appveyor
 
-andreasbuhr/cppcoro is currently tested with g++-10.2, g++-11.1, clang-10, clang-11, clang-12, clang-13, clang-14, clang-15, MSVC-2017, MSVC-2019, and MSVC-2022.
+andreasbuhr/cppcoro is currently tested with g++-10.2, g++-11.1, g++-12, g+-13, clang-10, clang-11, clang-12, clang-13, clang-14, clang-15, clang-16, MSVC-2017, MSVC-2019, and MSVC-2022.
 Current build status for master branch: [![Actions Status](https://github.com/andreasbuhr/cppcoro/workflows/CMake/badge.svg)](https://github.com/andreasbuhr/cppcoro/actions).
 
 Most of the changes are offered upstream:

include/cppcoro/config.hpp

@@ -78,6 +78,9 @@
 /// 0x0602 - Windows 8
 /// 0x0603 - Windows 8.1
 /// 0x0A00 - Windows 10
+#ifdef __MINGW32__
+#define SCOPEID_UNSPECIFIED_INIT {0}
+#endif
 #if defined(_WIN32_WINNT) || defined(_WIN32)
 # if !defined(_WIN32_WINNT)
 // Default to targeting Windows 10 if not defined.