Skip to content

Commit

Permalink
Merge branch 'develop' into feature/359-sequence-owning
Browse files Browse the repository at this point in the history
  • Loading branch information
anarthal committed Oct 11, 2024
2 parents 2573d8a + 41f07d2 commit 6c59857
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

_triggers = { "branch": [ "master", "develop" ] }
_container_tag = 'ee78aa84c0231742deb853556da1d56f5a2b8148'
_container_tag = '61b5b771ffefa8c04c43ddc9e023152461a8295f'
_win_container_tag = 'e7bd656c3515263f9b3c69a2d73d045f6a0fed72'


Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
coverage:
runs-on: ubuntu-latest
container:
image: ghcr.io/anarthal-containers/build-gcc13:ee78aa84c0231742deb853556da1d56f5a2b8148
image: ghcr.io/anarthal-containers/build-gcc13:61b5b771ffefa8c04c43ddc9e023152461a8295f
volumes:
- /var/run/mysqld:/var/run/mysqld
services:
mysql:
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
ports:
- 3306:3306
volumes:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
fuzz:
runs-on: ubuntu-latest
container:
image: ghcr.io/anarthal-containers/build-clang18:ee78aa84c0231742deb853556da1d56f5a2b8148
image: ghcr.io/anarthal-containers/build-clang18:61b5b771ffefa8c04c43ddc9e023152461a8295f
volumes:
- /var/run/mysqld:/var/run/mysqld
services:
mysql:
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-ee78aa84c0231742deb853556da1d56f5a2b8148
image: ghcr.io/anarthal-containers/ci-db:mysql-8.4.1-61b5b771ffefa8c04c43ddc9e023152461a8295f
ports:
- 3306:3306
volumes:
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang11.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-11 \
llvm-11 \
libssl-dev \
git \
python3 \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang14.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-14 \
llvm-14 \
libc++-14-dev \
libc++abi-14-dev \
libssl-dev \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang16-i386.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-16 \
llvm-16 \
libclang-rt-16-dev:i386 \
libc6-dev:i386 \
libstdc++-13-dev:i386 \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang16.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-16 \
llvm-16 \
libclang-rt-16-dev \
libc++-16-dev \
libc++abi-16-dev \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang17.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-17 \
llvm-17 \
libclang-rt-17-dev \
libc++-17-dev \
libc++abi-17-dev \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang18.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-18 \
llvm-18 \
libclang-rt-18-dev \
libc++-18-dev \
libc++abi-18-dev \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang3_6.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN \
apt-get update && \
apt-get --no-install-recommends -y install \
clang-3.6 \
llvm-3.6 \
libssl-dev \
git \
ca-certificates \
Expand Down
1 change: 1 addition & 0 deletions tools/docker/build-clang7.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN \
apt-get --no-install-recommends -y install \
ca-certificates \
clang-7 \
llvm-7 \
libssl-dev \
git \
python3 \
Expand Down
10 changes: 5 additions & 5 deletions tools/scripts/build_unix_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ set -e

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

BK=docs
IMAGE=build-docs
SHA=ee78aa84c0231742deb853556da1d56f5a2b8148
BK=b2
IMAGE=build-clang11
SHA=61b5b771ffefa8c04c43ddc9e023152461a8295f
CONTAINER=builder-$IMAGE
FULL_IMAGE=ghcr.io/anarthal-containers/$IMAGE:$SHA
DB=mysql-8.4.1
Expand All @@ -34,9 +34,9 @@ docker network connect my-net $CONTAINER || echo "Network already connected"
db_args="--server-host=$DB"
case $BK in
b2) cmd="$db_args
--toolset=gcc
--toolset=clang
--cxxstd=11
--variant=debug
--variant=release
--stdlib=native
--address-model=64
--separate-compilation=1
Expand Down

0 comments on commit 6c59857

Please sign in to comment.