diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index c0fa1623..c19594bc 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -47,9 +47,18 @@ jobs: with: python-version: 3.8 + - name: Set env vars + run: | + echo "CC=${{ matrix.compiler }}-${{ matrix.version }}" >> $GITHUB_ENV + if [ "${{ matrix.compiler }}" == "clang" ]; then + echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV + else + echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV + fi + - name: Install run: | - python -m pip install cmake==3.17.3 conan==1.28.1 --upgrade + python -m pip install cmake==3.22.2 conan==1.44.1 --upgrade wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main' -y @@ -57,12 +66,8 @@ jobs: if [ "${{ matrix.compiler }}" = "gcc" ]; then sudo apt-get install -y g++-${{ matrix.version }} g++-${{ matrix.version }}-multilib - echo "::set-env name=CC::gcc-${{ matrix.version }}" - echo "::set-env name=CXX::g++-${{ matrix.version }}" else sudo apt-get install -y clang-${{ matrix.version }} clang-tidy-${{ matrix.version }} g++-multilib - echo "::set-env name=CC::clang-${{ matrix.version }}" - echo "::set-env name=CXX::clang++-${{ matrix.version }}" fi - name: Install dependencies (system) diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml index 04aefe7d..16379e76 100644 --- a/.github/workflows/ci-windows.yaml +++ b/.github/workflows/ci-windows.yaml @@ -38,7 +38,7 @@ jobs: - name: Install run: | - python -m pip install cmake==3.17.3 conan==1.28.1 --upgrade + python -m pip install cmake==3.22.2 conan==1.44.1 --upgrade conan profile new default --detect --force mkdir -p build && cd build conan install .. --build=missing -s arch=${{ matrix.conan_arch }} -s build_type=${{ matrix.type }} diff --git a/autobahn/wamp_session.ipp b/autobahn/wamp_session.ipp index b889996e..c3868cd8 100644 --- a/autobahn/wamp_session.ipp +++ b/autobahn/wamp_session.ipp @@ -121,7 +121,7 @@ inline boost::future wamp_session::stop() } if (!m_transport) { - m_session_start.set_exception(boost::copy_exception(no_transport_error())); + m_session_stop.set_exception(boost::copy_exception(no_transport_error())); return; }