Skip to content

Commit

Permalink
Merge pull request #230 from oberstet/session_wrong_future
Browse files Browse the repository at this point in the history
Session wrong future
  • Loading branch information
oberstet authored Jan 27, 2022
2 parents 7816866 + ac4803e commit 0fb8045
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/ci-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,27 @@ 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
sudo apt update
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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion autobahn/wamp_session.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ inline boost::future<void> 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;
}

Expand Down

0 comments on commit 0fb8045

Please sign in to comment.