Skip to content

Commit

Permalink
Merge branch 'develop' into feature/214-sql-formatting-fuzz
Browse files Browse the repository at this point in the history
  • Loading branch information
anarthal committed Mar 7, 2024
2 parents 79604b2 + 5b604cf commit 4db4452
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 61 deletions.
6 changes: 4 additions & 2 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#

_triggers = { "branch": [ "master", "develop", "drone*", "feature/*", "bugfix/*", "fix/*", "pr/*" ] }
_container_tag = '1f4d636dddc2f5af1774b42e6177a06457808330'
_win_container_tag = '1f4d636dddc2f5af1774b42e6177a06457808330'
_container_tag = 'ca0db5925a497b70e7d6b303c81d56b70c06f9ef'
_win_container_tag = 'ca0db5925a497b70e7d6b303c81d56b70c06f9ef'


def _image(name):
Expand Down Expand Up @@ -271,6 +271,8 @@ def main(ctx):
linux_b2('Linux B2 clang-16-sanit', _image('build-clang16'), toolset='clang-16', cxxstd='20', address_sanitizer=1, undefined_sanitizer=1),
linux_b2('Linux B2 clang-16-i386-sanit', _image('build-clang16-i386'), toolset='clang-16', cxxstd='20', address_model=32, address_sanitizer=1, undefined_sanitizer=1),
linux_b2('Linux B2 gcc-5', _image('build-gcc5'), toolset='gcc-5', cxxstd='11'), # gcc-5 C++14 doesn't like my constexpr field_view
linux_b2('Linux B2 clang-17', _image('build-clang17'), toolset='clang-17', cxxstd='20'),
linux_b2('Linux B2 clang-18', _image('build-clang18'), toolset='clang-18', cxxstd='23'),
linux_b2('Linux B2 gcc-5-ts-executor', _image('build-gcc5'), toolset='gcc-5', cxxstd='11', use_ts_executor=1),
linux_b2('Linux B2 gcc-6', _image('build-gcc6'), toolset='gcc-6', cxxstd='14,17'),
linux_b2('Linux B2 gcc-10', _image('build-gcc10'), toolset='gcc-10', cxxstd='17,20'),
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
- { image: build-clang11, dockerfile: build-clang11, platforms: "linux/amd64", }
- { image: build-clang14, dockerfile: build-clang14, platforms: "linux/amd64, linux/arm64/v8" }
- { image: build-clang16, dockerfile: build-clang16, platforms: "linux/amd64" }
- { image: build-clang17, dockerfile: build-clang17, platforms: "linux/amd64" }
- { image: build-clang18, dockerfile: build-clang18, platforms: "linux/amd64" }
- { image: build-clang16-i386, dockerfile: build-clang16-i386, platforms: "linux/amd64" }
- { image: build-gcc5, dockerfile: build-gcc5, platforms: "linux/amd64", }
- { image: build-gcc6, dockerfile: build-gcc6, platforms: "linux/amd64", }
Expand Down
27 changes: 27 additions & 0 deletions tools/docker/build-clang17.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#
# Copyright (c) 2019-2024 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
#
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#

FROM ubuntu:23.10

RUN \
apt-get update && \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-17 \
libclang-rt-17-dev \
libc++-17-dev \
libc++abi-17-dev \
libssl-dev \
git \
ninja-build \
python3 \
python3-requests \
python-is-python3 \
mysql-client && \
ln -s /usr/bin/clang++-17 /usr/bin/clang++ && \
ln -s /usr/bin/clang-17 /usr/bin/clang

34 changes: 34 additions & 0 deletions tools/docker/build-clang18.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# Copyright (c) 2019-2024 Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
#
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#

FROM ubuntu:23.10

RUN \
apt-get update && \
apt-get --no-install-recommends -y install \
wget \
ca-certificates \
libssl-dev \
git \
ninja-build \
python3 \
python3-requests \
python-is-python3 \
mysql-client && \
echo 'deb http://apt.llvm.org/mantic/ llvm-toolchain-mantic-18 main' > /etc/apt/sources.list.d/llvm.list && \
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
apt-get update && \
apt-get --no-install-recommends -y install \
clang-18 \
libclang-rt-18-dev \
libc++-18-dev \
libc++abi-18-dev && \
apt-get -y remove wget && \
apt-get -y autoremove && \
ln -s /usr/bin/clang++-18 /usr/bin/clang++ && \
ln -s /usr/bin/clang-18 /usr/bin/clang

2 changes: 1 addition & 1 deletion tools/docker/mariadb.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#

FROM mariadb:11.1.2
FROM mariadb:11.3.2

ENV MYSQL_ALLOW_EMPTY_PASSWORD=1
ENV MYSQL_ROOT_PASSWORD=
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/mysql8.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#

FROM mysql:8.1.0
FROM mysql:8.3.0

ENV MYSQL_ALLOW_EMPTY_PASSWORD=1
ENV MYSQL_ROOT_PASSWORD=
Expand Down
57 changes: 0 additions & 57 deletions tools/valgrind_suppressions.txt
Original file line number Diff line number Diff line change
@@ -1,57 +0,0 @@
{
<insert_a_suppression_name_here>
Memcheck:Cond
...
obj:/*/libssl.so*
...
}

{
<insert_a_suppression_name_here>
Memcheck:Value8
...
obj:/*/libssl.so*
...
}

{
libssl_internal_threads
Memcheck:Cond
...
obj:/*libcrypto.so*
}

{
libssl_internal_threads
Memcheck:Value8
...
obj:/*libcrypto.so*
}

{
asio_ssl_handshake_sync
Memcheck:Param
sendmsg(msg.msg_iov[0])
...
fun:_ZN5boost4asio3ssl6stream*handshake*
fun:_ZN5boost5mysql6detail7channel*ssl_handshake*
...
}

{
asio_ssl_handshake_async
Memcheck:Param
sendmsg(msg.msg_iov[0])
...
fun:_ZN5boost4asio3ssl6detail5io_op*
fun:_ZN5boost4asio3ssl6detail8async_io*
}

{
asio_ssl_handshake_async
Memcheck:Param
sendmsg(msg.msg_iov[0])
...
fun:_ZN5boost4asio*async_write_some*ssl*io_op*handshake_op*
}

0 comments on commit 4db4452

Please sign in to comment.