Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build 20231004 #34

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Fix build 20231004 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2857d98
fix build at 20231004
Oct 4, 2023
fdb07b5
checkout v8 to 11.9 && switch to tumbleweed images
Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/depot_tools
Open in desktop
Submodule depot_tools updated from 401f0f to 60adf7
2 changes: 1 addition & 1 deletion contrib/pistache
Open in desktop
Submodule pistache updated 33 files
+4 −2 .github/workflows/debian-changelog.yaml
+6 −3 .github/workflows/linux.yaml
+9 −9 README.md
+1 −1 include/pistache/client.h
+1 −0 include/pistache/flags.h
+40 −13 include/pistache/http.h
+29 −15 include/pistache/http_header.h
+1 −1 include/pistache/http_headers.h
+2 −0 include/pistache/listener.h
+3 −1 include/pistache/meson.build
+62 −19 include/pistache/net.h
+24 −0 include/pistache/router.h
+18 −2 meson.build
+2 −0 meson_options.txt
+16 −7 src/client/client.cc
+68 −1 src/common/http.cc
+27 −5 src/common/http_header.cc
+1 −1 src/common/http_headers.cc
+1 −2 src/common/mime.cc
+225 −208 src/common/net.cc
+23 −11 src/common/peer.cc
+4 −0 src/meson.build
+2 −2 src/server/endpoint.cc
+93 −46 src/server/listener.cc
+129 −130 tests/headers_test.cc
+4 −4 tests/http_client_test.cc
+231 −4 tests/http_server_test.cc
+38 −2 tests/listener_test.cc
+60 −6 tests/net_test.cc
+16 −4 tests/router_test.cc
+3 −6 tests/tcp_client.h
+1 −1 tests/view_test.cc
+1 −1 version.txt
2 changes: 1 addition & 1 deletion contrib/restclient-cpp
Open in desktop
Submodule restclient-cpp updated 1 files
+1 −0 include/restclient-cpp/connection.h
3 changes: 2 additions & 1 deletion scripts/Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM opensuse/leap
FROM opensuse/tumbleweed
LABEL Name=chatterbox-builder

RUN zypper -n install --no-recommends \
xz \
awk \
wget \
find \
make \
Expand Down
6 changes: 3 additions & 3 deletions scripts/Dockerfile.chatterbox
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse/leap
FROM opensuse/tumbleweed
LABEL Name=chatterbox

RUN zypper -n install --no-recommends curl \
Expand All @@ -7,6 +7,6 @@ RUN zypper -n install --no-recommends curl \
RUN mkdir /monitor
VOLUME /monitor

COPY chatterbox /usr/bin/chatterbox
COPY cbx /usr/bin/cbx

ENTRYPOINT ["chatterbox"]
ENTRYPOINT ["cbx"]
6 changes: 3 additions & 3 deletions scripts/Dockerfile.chatterbox-test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse/leap
FROM opensuse/tumbleweed
LABEL Name=chatterbox-test

RUN zypper -n install --no-recommends curl \
Expand All @@ -7,7 +7,7 @@ RUN zypper -n install --no-recommends curl \
RUN mkdir -p /wd/scenarios
COPY scenarios /wd/scenarios

COPY chatterbox_test /usr/bin/chatterbox_test
COPY cbx_test /usr/bin/cbx_test

WORKDIR /wd
ENTRYPOINT ["chatterbox_test"]
ENTRYPOINT ["cbx_test"]
15 changes: 10 additions & 5 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

container_mng=${CNT_MNG:-"podman"}
container_mng=${CNT_MNG:-"docker"}
basedir=$(realpath ${BASE_DIR:-"../"})
ninja_jobs=${NINJA_JOBS:-"6"}
builder_image=${BUILDER_IMAGE:-"chatterbox-builder"}
Expand Down Expand Up @@ -87,12 +87,12 @@ create_chatterbox_test() {

build() {
echo "Building chatterbox binary ..."
mkdir -p $basedir/build && cd $basedir/build && cmake -DCONTRIB_PATH=$contrib_path .. && make chatterbox
mkdir -p $basedir/build && cd $basedir/build && cmake -DCONTRIB_PATH=$contrib_path .. && make cbx
}

build_test() {
echo "Building chatterbox-test binary ..."
mkdir -p $basedir/build && cd $basedir/build && cmake -DCONTRIB_PATH=$contrib_path .. && make chatterbox_test
mkdir -p $basedir/build && cd $basedir/build && cmake -DCONTRIB_PATH=$contrib_path .. && make cbx_test
}

clean() {
Expand Down Expand Up @@ -155,15 +155,16 @@ clean_googletest() {
# see this issue: https://bugs.chromium.org/p/v8/issues/detail?id=13455
patch_v8_code() {
sed -i 's/std::is_pod/std::is_standard_layout/g' $basedir/contrib/v8/src/base/vector.h
sed -i 's/std::back_insert_iterator(snapshots)/std::back_insert_iterator<base::SmallVector<Snapshot, 8>>(snapshots)/g' $basedir/contrib/v8/src/compiler/turboshaft/wasm-gc-type-reducer.cc
}

build_v8() {
echo "Building V8 ..."
PATH=$contrib_path/depot_tools:$PATH
gclient
cd $contrib_path
fetch v8
cd v8
git checkout branch-heads/11.9
args=$(cat <<EOF
dcheck_always_on = false
is_component_build = false
Expand All @@ -183,7 +184,11 @@ EOF

clean_v8() {
echo "Cleaning v8 build ..."
rm -rf $contrib_path/v8/out
rm -rf $contrib_path/v8
rm -rf $contrib_path/.cipd
rm -rf $contrib_path/.gclient
rm -rf $contrib_path/.gclient_entries
rm -rf $contrib_path/.gclient_previous_sync_commits
}

build_deps() {
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ link_directories(${CONTRIB_PATH}/restclient-cpp/.libs
${CONTRIB_PATH}/cryptopp
${CONTRIB_PATH}/v8/out/x86.release/obj)

add_executable(chatterbox
add_executable(cbx
main.cpp
utils.cpp
crypto.cpp
Expand All @@ -36,7 +36,7 @@ add_executable(chatterbox
endpoint.cpp
cbox.cpp)

target_link_libraries(chatterbox
target_link_libraries(cbx
"librestclient-cpp.a"
ryml
pistache
Expand Down
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ link_directories(${CONTRIB_PATH}/restclient-cpp/.libs
${CONTRIB_PATH}/v8/out/x86.release/obj
${CONTRIB_PATH}/googletest/build/lib)

add_executable(chatterbox_test
add_executable(cbx_test
test.cpp
${CHATTERBOX_PATH}/utils.cpp
${CHATTERBOX_PATH}/crypto.cpp
Expand All @@ -40,7 +40,7 @@ add_executable(chatterbox_test
${CHATTERBOX_PATH}/endpoint.cpp
${CHATTERBOX_PATH}/cbox.cpp)

target_link_libraries(chatterbox_test
target_link_libraries(cbx_test
"librestclient-cpp.a"
ryml
pistache
Expand Down
Loading