Skip to content

Commit 6c59857

Browse files
committed
Merge branch 'develop' into feature/359-sequence-owning
2 parents 2573d8a + 41f07d2 commit 6c59857

12 files changed

+18
-10
lines changed

.drone.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77

88
_triggers = { "branch": [ "master", "develop" ] }
9-
_container_tag = 'ee78aa84c0231742deb853556da1d56f5a2b8148'
9+
_container_tag = '61b5b771ffefa8c04c43ddc9e023152461a8295f'
1010
_win_container_tag = 'e7bd656c3515263f9b3c69a2d73d045f6a0fed72'
1111

1212

.github/workflows/coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
coverage:
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/anarthal-containers/build-gcc13:ee78aa84c0231742deb853556da1d56f5a2b8148
21+
image: ghcr.io/anarthal-containers/build-gcc13:61b5b771ffefa8c04c43ddc9e023152461a8295f
2222
volumes:
2323
- /var/run/mysqld:/var/run/mysqld
2424
services:
2525
mysql:
26-
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
26+
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
2727
ports:
2828
- 3306:3306
2929
volumes:

.github/workflows/fuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
fuzz:
2121
runs-on: ubuntu-latest
2222
container:
23-
image: ghcr.io/anarthal-containers/build-clang18:ee78aa84c0231742deb853556da1d56f5a2b8148
23+
image: ghcr.io/anarthal-containers/build-clang18:61b5b771ffefa8c04c43ddc9e023152461a8295f
2424
volumes:
2525
- /var/run/mysqld:/var/run/mysqld
2626
services:
2727
mysql:
28-
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
28+
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
2929
ports:
3030
- 3306:3306
3131
volumes:

tools/docker/build-clang11.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-11 \
15+
llvm-11 \
1516
libssl-dev \
1617
git \
1718
python3 \

tools/docker/build-clang14.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-14 \
15+
llvm-14 \
1516
libc++-14-dev \
1617
libc++abi-14-dev \
1718
libssl-dev \

tools/docker/build-clang16-i386.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN \
1414
apt-get --no-install-recommends -y install \
1515
ca-certificates \
1616
clang-16 \
17+
llvm-16 \
1718
libclang-rt-16-dev:i386 \
1819
libc6-dev:i386 \
1920
libstdc++-13-dev:i386 \

tools/docker/build-clang16.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-16 \
15+
llvm-16 \
1516
libclang-rt-16-dev \
1617
libc++-16-dev \
1718
libc++abi-16-dev \

tools/docker/build-clang17.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-17 \
15+
llvm-17 \
1516
libclang-rt-17-dev \
1617
libc++-17-dev \
1718
libc++abi-17-dev \

tools/docker/build-clang18.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-18 \
15+
llvm-18 \
1516
libclang-rt-18-dev \
1617
libc++-18-dev \
1718
libc++abi-18-dev \

tools/docker/build-clang3_6.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN \
1111
apt-get update && \
1212
apt-get --no-install-recommends -y install \
1313
clang-3.6 \
14+
llvm-3.6 \
1415
libssl-dev \
1516
git \
1617
ca-certificates \

tools/docker/build-clang7.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN \
1212
apt-get --no-install-recommends -y install \
1313
ca-certificates \
1414
clang-7 \
15+
llvm-7 \
1516
libssl-dev \
1617
git \
1718
python3 \

tools/scripts/build_unix_local.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ set -e
1010

1111
repo_base=$(realpath $(dirname $(realpath $0))/../..)
1212

13-
BK=docs
14-
IMAGE=build-docs
15-
SHA=ee78aa84c0231742deb853556da1d56f5a2b8148
13+
BK=b2
14+
IMAGE=build-clang11
15+
SHA=61b5b771ffefa8c04c43ddc9e023152461a8295f
1616
CONTAINER=builder-$IMAGE
1717
FULL_IMAGE=ghcr.io/anarthal-containers/$IMAGE:$SHA
1818
DB=mysql-8.4.1
@@ -34,9 +34,9 @@ docker network connect my-net $CONTAINER || echo "Network already connected"
3434
db_args="--server-host=$DB"
3535
case $BK in
3636
b2) cmd="$db_args
37-
--toolset=gcc
37+
--toolset=clang
3838
--cxxstd=11
39-
--variant=debug
39+
--variant=release
4040
--stdlib=native
4141
--address-model=64
4242
--separate-compilation=1

0 commit comments

Comments
 (0)