Skip to content

Commit 8883630

Browse files
committed
chore: fix build script and dockerfile
Signed-off-by: Jian Zhang <[email protected]>
1 parent e1cbd4b commit 8883630

File tree

7 files changed

+32
-143
lines changed

7 files changed

+32
-143
lines changed

.circleci/config.yml

-98
This file was deleted.

.github/workflows/conventional-commits.yml

-16
This file was deleted.

.github/workflows/pr-check.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR Check
2+
3+
on: [pull_request, pull_request_target]
4+
5+
jobs:
6+
job_0:
7+
name: Signed Commits
8+
steps:
9+
- name: Check out the repository code
10+
uses: actions/[email protected]
11+
- name: Check if the commits are signed
12+
uses: 1Password/check-signed-commits-action@v1
13+
job_1:
14+
name: Conventional Title
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Conventional Title Validation
18+
uses: ytanikin/[email protected]
19+
with:
20+
task_types: '["feat","fix","perf","chore","revert"]'
21+
add_label: 'false'

CMakePresets.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"cacheVariables": {
2929
"CMAKE_BUILD_TYPE": "Release",
3030
"COUNTERS_LEVEL": "none",
31-
"ENABLE_PROFILING": "ON"
31+
"ENABLE_PROFILING": "OFF",
32+
"BUILD_SHARED_LIBS": "OFF"
3233
}
3334
},
3435
{

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[![CI][9]][10]
2-
[![CircleCI][1]][2]
32
[![codecov][3]][4]
43

54
# LeanStore
@@ -36,8 +35,6 @@ LeanStore is under the [MIT License][7].
3635

3736
Thanks for the LeanStore authors and the [leanstore/leanstore][8] project.
3837

39-
[1]: https://dl.circleci.com/status-badge/img/circleci/MkFUq3aTNH5S7gLVEtwrGF/XCiiFNumkGdcD65tKp4EEy/tree/main.svg?style=shield&circle-token=28e7f69f9698ab8b805730e038065a9f54c29668
40-
[2]: https://dl.circleci.com/status-badge/redirect/circleci/MkFUq3aTNH5S7gLVEtwrGF/XCiiFNumkGdcD65tKp4EEy/tree/main
4138
[3]: https://codecov.io/github/zz-jason/leanstore/graph/badge.svg?token=MBS1H361JJ
4239
[4]: https://codecov.io/github/zz-jason/leanstore
4340
[5]: ./docker/Dockerfile
@@ -46,3 +43,4 @@ Thanks for the LeanStore authors and the [leanstore/leanstore][8] project.
4643
[8]: http://github.com/leanstore/leanstore
4744
[9]: https://github.com/zz-jason/leanstore/actions/workflows/ci.yml/badge.svg
4845
[10]: https://github.com/zz-jason/leanstore/actions/workflows/ci.yml
46+

docker/Dockerfile

+3-21
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:24.04
22

33
################################################################################
44
# install prerequisted libriaries
@@ -11,27 +11,13 @@ RUN apt-get update && apt-get install -y \
1111
&& rm -rf /var/lib/apt/lists/*
1212

1313
RUN apt-get update && apt-get install -y \
14-
git cmake make gcc-13 g++-13 ninja-build \
14+
git cmake make gcc g++ ninja-build \
1515
&& rm -rf /var/lib/apt/lists/*
1616

1717
RUN apt-get update && apt-get install -y \
1818
libaio-dev python3-pip cppcheck \
1919
&& rm -rf /var/lib/apt/lists/*
2020

21-
RUN pip3 install gcovr==6.0 --break-system-packages
22-
23-
RUN ln -sf /usr/bin/cpp-13 /usr/bin/cpp \
24-
&& ln -sf /usr/bin/g++-13 /usr/bin/g++ \
25-
&& ln -sf /usr/bin/gcc-13 /usr/bin/gcc \
26-
&& ln -sf /usr/bin/gcc-ar-13 /usr/bin/gcc-ar \
27-
&& ln -sf /usr/bin/gcc-nm-13 /usr/bin/gcc-nm \
28-
&& ln -sf /usr/bin/gcc-ranlib-13 /usr/bin/gcc-ranlib \
29-
&& ln -sf /usr/bin/gcov-13 /usr/bin/gcov \
30-
&& ln -sf /usr/bin/gcov-dump-13 /usr/bin/gcov-dump \
31-
&& ln -sf /usr/bin/gcov-tool-13 /usr/bin/gcov-tool \
32-
&& ln -sf /usr/bin/lto-dump-13 /usr/bin/lto-dump \
33-
&& ln -sf /usr/bin/g++-13 /usr/bin/c++ \
34-
&& ln -sf /usr/bin/gcc-13 /usr/bin/cc
3521

3622
# install vcpkg and its prerequisites
3723
RUN apt-get update && apt-get install -y \
@@ -43,17 +29,13 @@ RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg \
4329
&& echo 'export PATH=$VCPKG_ROOT:$PATH' >> ~/.bashrc \
4430
&& echo 'export VCPKG_FORCE_SYSTEM_BINARIES=1' >> ~/.bashrc
4531

46-
# config vcpkg triplets
4732
RUN mv /opt/vcpkg/triplets/x64-linux.cmake /opt/vcpkg/triplets/x64-linux-static.cmake
4833
COPY vcpkg-triplets/x64-linux.cmake /opt/vcpkg/triplets/x64-linux.cmake
4934
COPY vcpkg-triplets/arm64-linux.cmake /opt/vcpkg/triplets/arm64-linux.cmake
5035

51-
# for gperftools, pprof, pidstat
5236
RUN apt-get update && apt-get install -y \
5337
autoconf libtool golang graphviz sysstat \
54-
&& rm -rf /var/lib/apt/lists/* \
55-
&& go install github.com/google/pprof@latest \
56-
&& echo 'export PATH=$HOME/go/bin:$PATH' >> ~/.bashrc
38+
&& rm -rf /var/lib/apt/lists/*
5739

5840

5941
################################################################################

docker/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ docker build -t leanstore-dev .
1313
Run a container based on the image:
1414

1515
```sh
16-
docker run -it --privileged -v /path/to/leanstore/on/host:/path/to/leanstore/on/container leanstore-dev bash
16+
docker run -it --privileged --network=host -v /path/to/leanstore/on/host:/path/to/leanstore/on/container leanstore-dev bash
1717
```
1818

1919
Build and test LeanStore in the running container:
2020

2121
```sh
2222
cd /path/to/leanstore/on/container
23-
cmake -B build -S .
24-
cmake --build build -j `nproc`
25-
ctest --test-dir build
23+
cmake --preset debug
24+
cmake --build build/debug -j `nproc`
25+
ctest --test-dir build/debug
2626
```
27+

0 commit comments

Comments
 (0)