Skip to content

Commit 6f9ed9b

Browse files
committed
build-docker-BasicBuilds
1 parent 3207e4c commit 6f9ed9b

File tree

2 files changed

+67
-64
lines changed

2 files changed

+67
-64
lines changed

.github/workflows/nightly.yml

Lines changed: 67 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
name: Nightly
33

44
# This job is run at 00:00 UTC every day or on demand.
5-
on: workflow_call
6-
# workflow_dispatch:
7-
# schedule:
8-
# - cron: '0 0 * * *'
5+
on:
6+
workflow_dispatch:
7+
schedule:
8+
- cron: '0 0 * * *'
99

1010
permissions:
1111
contents: read
@@ -27,32 +27,46 @@ jobs:
2727
with:
2828
fetch-depth: 0
2929

30-
# - name: Build Docker image
31-
# run: |
32-
# docker build -f .github/docker/ubuntu-20.04.Dockerfile -t umf-ubuntu-20.04 .
33-
34-
- name: Fuzz long test in Docker container
30+
- name: Install apt packages
3531
run: |
36-
docker run --rm \
37-
-v ${{github.workspace}}:/workspace \
38-
-w /workspace \
39-
--env BUILD_TYPE=${{matrix.build_type}} \
40-
--user root \
41-
umf-ubuntu-20.04 \
42-
bash -c "
43-
export VALGRIND_LIB=/usr/lib/valgrind/ &&
44-
apt-get update &&
45-
apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev &&
46-
cmake -B /workspace/build \
47-
-DCMAKE_BUILD_TYPE=\$BUILD_TYPE \
48-
-DCMAKE_C_COMPILER=${{matrix.compiler.c}} \
49-
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} \
50-
-DUMF_TESTS_FAIL_ON_SKIP=ON \
51-
-DUMF_DEVELOPER_MODE=ON \
52-
-DUMF_BUILD_FUZZTESTS=ON &&
53-
cmake --build /workspace/build --config \$BUILD_TYPE --verbose -j$(nproc) &&
54-
ctest -C \$BUILD_TYPE --output-on-failure --verbose -L "fuzz-long"
55-
"
32+
sudo apt-get update
33+
sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev
34+
35+
- name: Configure CMake
36+
run: >
37+
cmake
38+
-B ${{github.workspace}}/build
39+
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
40+
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
41+
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
42+
-DUMF_TESTS_FAIL_ON_SKIP=ON
43+
-DUMF_DEVELOPER_MODE=ON
44+
-DUMF_BUILD_FUZZTESTS=ON
45+
46+
- name: Build
47+
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} --verbose -j$(nproc)
48+
49+
- name: Fuzz long test
50+
working-directory: ${{github.workspace}}/build
51+
run: ctest -C ${{matrix.build_type}} --output-on-failure --verbose -L "fuzz-long"
52+
53+
build-docker-BasicBuilds:
54+
name: Build Docker image
55+
needs: [FastBuild]
56+
runs-on: ubuntu-latest
57+
steps:
58+
- name: Checkout repository
59+
uses: actions/checkout@v4
60+
61+
- name: Build Docker image
62+
run: |
63+
docker build -f .github/docker/ubuntu-20.04.Dockerfile -t umf-ubuntu-20.04 .
64+
65+
- name: Run BasicBuilds
66+
run: |
67+
docker run --rm umf-ubuntu-20.04 sh -c "
68+
gh workflow run ./.github/workflows/reusable_basic.yml \
69+
"
5670
5771
valgrind:
5872
name: Valgrind
@@ -68,34 +82,30 @@ jobs:
6882
with:
6983
fetch-depth: 0
7084

71-
# - name: Build Docker image
72-
# run: |
73-
# docker build -f .github/docker/ubuntu-20.04.Dockerfile -t umf-ubuntu-20.04 .
74-
75-
- name: Run tests under valgrind in Docker
85+
- name: Install apt packages
7686
run: |
77-
docker run --rm \
78-
-v ${{github.workspace}}:/workspace \
79-
-w /workspace \
80-
--env TOOL=${{ matrix.tool }} \
81-
--user root \
82-
umf-ubuntu-20.04 \
83-
bash -c "\
84-
apt-get update &&
85-
apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind &&
86-
cmake -B /workspace/build \
87-
-DCMAKE_BUILD_TYPE=Debug \
88-
-DUMF_FORMAT_CODE_STYLE=OFF \
89-
-DUMF_DEVELOPER_MODE=ON \
90-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON \
91-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON \
92-
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF \
93-
-DUMF_BUILD_CUDA_PROVIDER=OFF \
94-
-DUMF_USE_VALGRIND=1 \
95-
-DUMF_TESTS_FAIL_ON_SKIP=ON &&
96-
cmake --build /workspace/build --config Debug -j$(nproc) &&
97-
/workspace/test/test_valgrind.sh /workspace /workspace/build \$TOOL
98-
"
87+
sudo apt-get update
88+
sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind
89+
90+
- name: Configure CMake
91+
run: >
92+
cmake
93+
-B ${{github.workspace}}/build
94+
-DCMAKE_BUILD_TYPE=Debug
95+
-DUMF_FORMAT_CODE_STYLE=OFF
96+
-DUMF_DEVELOPER_MODE=ON
97+
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
98+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
99+
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
100+
-DUMF_BUILD_CUDA_PROVIDER=OFF
101+
-DUMF_USE_VALGRIND=1
102+
-DUMF_TESTS_FAIL_ON_SKIP=ON
103+
104+
- name: Build
105+
run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc)
106+
107+
- name: Run tests under valgrind
108+
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}}
99109

100110
# TODO fix #843
101111
#icx:
@@ -201,4 +211,4 @@ jobs:
201211
short_run: false
202212
# Beside the 2 LTS Ubuntu, we also test this on the latest Ubuntu - to be updated
203213
# every 6 months, so we verify the latest version of packages (compilers, etc.).
204-
os: "['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-24.10']"
214+
os: "['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-24.10']"

CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ include(CMakePackageConfigHelpers)
3333
include(GNUInstallDirs)
3434
find_package(PkgConfig)
3535

36-
find_package(Valgrind REQUIRED)
37-
if(Valgrind_FOUND)
38-
message(STATUS "Found Valgrind!")
39-
else()
40-
message(FATAL_ERROR "Valgrind not found!")
41-
endif()
42-
4336
# Define a list to store the names of all options
4437
set(UMF_OPTIONS_LIST "")
4538
list(APPEND UMF_OPTIONS_LIST CMAKE_BUILD_TYPE)

0 commit comments

Comments
 (0)