Skip to content

Commit d3dd14f

Browse files
committed
Fixed failed tests.
Updated actions.
1 parent 11e7481 commit d3dd14f

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.github/workflows/build-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Clang
1414
run: |
1515
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
16-
sudo apt install libc++-15-dev libc++abi-15-dev
16+
sudo apt-get install -y libc++-15-dev libc++abi-15-dev
1717
1818
- name: Build Conan Dependencies
1919
run: |

.github/workflows/static-analysis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ jobs:
1111
- uses: actions/checkout@v3
1212

1313
- name: Set up Clang
14-
uses: egor-tensin/setup-clang@v1
15-
with:
16-
version: 15
14+
run: |
15+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
16+
sudo apt-get install -y libc++-15-dev libc++abi-15-dev
1717
18-
- name: Install Dependencies
18+
- name: Install Cppcheck
1919
run: |
2020
sudo apt-get update
21-
sudo apt-get install -y libstdc++6 cppcheck
21+
sudo apt-get install -y cppcheck
2222
2323
- name: Build Conan Dependencies
2424
run: |
2525
pip install conan==1.60.0
2626
conan config set general.revisions_enabled=True
27-
conan install . --build=missing -pr=./conanprofile.txt -if ./build
27+
conan install . --build=missing -pr=./conanprofile.txt -if ./build -s andreasbuhr-cppcoro:compiler.libcxx=libc++
2828
2929
- name: Configure CMake
3030
run: cmake -B ${{github.workspace}}/build -DFAIL_ON_WARNINGS=ON

conanfile.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sqlite3/3.39.2#bcbc402aeced01e756cb1e7199a7f188
1919
# Added to fix clashes between dependencies
2020
libcurl/7.85.0#63e97620160ac0273d500d743786e4dd
2121
openssl/1.1.1q#d09951d2f9ed326551512e63839d0767
22-
zlib/1.2.12#82202701ea360c0863f1db5008067122
22+
zlib/1.2.12#b1fd071d8a2234a488b3ff74a3526f81
2323

2424
# Added to fix new recipes build issues
2525
bzip2/1.0.8#0c10430c6fe37dec1b37a7bc1fbbe51b
@@ -38,6 +38,7 @@ aws-crt-cpp/0.17.23#f3272a7219d4d58a1e4976b68da820e5
3838
aws-checksums/0.1.12#d27222a24697575e39cb59c034d4cd19
3939
m4/1.4.19#7bf4b7de37a545f40f65aeb26e4f135f
4040
pkgconf/1.9.3#02904517fb960fa340bee15bef847751
41+
libtool/2.4.6#5c0876c3f4d1d47b56c56cdd4e14202e
4142

4243
# In case of library build issues:
4344
# 1. conan remove "LIB_NAME*"

include/lib/restsdk/restsdk_call_as_coroutine.h

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ auto CallAsCoroutine [[nodiscard]] (const pplx::task<T> &task)
4343
if (!exception_message.empty()) {
4444
throw cpp::MessageException{std::move(exception_message)};
4545
}
46-
47-
Expects(false);
4846
}
4947
} // namespace vh::restsdk
5048

0 commit comments

Comments
 (0)