From 18427e95e37e145c2a15c4051e3dc52a6d6e97f8 Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Wed, 26 Jan 2022 12:11:58 +1300 Subject: [PATCH 1/3] wamp_session: set_exception on the correct future --- autobahn/wamp_session.ipp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From a9bc73ad8ab45c06e9b51da5504714c662cd5ee1 Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Thu, 27 Jan 2022 11:57:27 +1300 Subject: [PATCH 2/3] CI: Avoid "set-env" in github Linux CI workflow --- .github/workflows/ci-linux.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index c0fa1623..8775fd58 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -47,6 +47,15 @@ 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 @@ -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) From ac4803eef51f2c03a8cf6789c2c71223be8a8c49 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 27 Jan 2022 17:13:38 +0100 Subject: [PATCH 3/3] bump cmake/conan versions used --- .github/workflows/ci-linux.yaml | 2 +- .github/workflows/ci-windows.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index 8775fd58..c19594bc 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -58,7 +58,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 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 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 }}