Skip to content

Commit 1c80c1a

Browse files
cosmo0920edsiper
authored andcommitted
workflows: Confirm libmsgpack-c linking in CI
Signed-off-by: Hiroshi Hatake <[email protected]>
1 parent c94c72f commit 1c80c1a

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

.github/workflows/pr-compile-check.yaml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Sanity check for compilation using system libraries
3535
pr-compile-system-libs:
36-
runs-on: ubuntu-22.04
36+
runs-on: ${{ matrix.os.version }}
3737
timeout-minutes: 60
3838
strategy:
3939
fail-fast: false
@@ -49,12 +49,20 @@ jobs:
4949
- clang:
5050
cc: clang
5151
cxx: clang++
52+
os:
53+
- version: ubuntu-22.04
54+
clang: "clang-12"
55+
- version: ubuntu-24.04
56+
clang: "clang-14"
57+
5258
steps:
53-
- name: Setup environment
59+
- name: Setup environment for ${{ matrix.os.version }} with ${{ matrix.os.clang }}
5460
run: |
5561
sudo apt-get update
56-
sudo apt-get install -y curl gcc-9 g++-9 clang-12 libsystemd-dev gcovr libyaml-dev
62+
sudo apt-get install -y curl gcc-9 g++-9 ${CLANG_PKG} libsystemd-dev gcovr libyaml-dev
5763
sudo ln -s /usr/bin/llvm-symbolizer-12 /usr/bin/llvm-symbolizer || true
64+
env:
65+
CLANG_PKG: ${{ matrix.os.clang }}
5866

5967
- name: Install system libraries for this test
6068
run: |
@@ -80,7 +88,7 @@ jobs:
8088
echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT"
8189
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90
8290
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 90
83-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 90
91+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/${CLANG_PKG} 90
8492
cmake $GLOBAL_OPTS $FLB_OPT ../
8593
make -j $nparallel
8694
working-directory: build
@@ -89,6 +97,7 @@ jobs:
8997
CXX: ${{ matrix.compiler.cxx }}
9098
FLB_OPT: ${{ matrix.flb_option }}
9199
GLOBAL_OPTS: "-DFLB_JEMALLOC=On -DFLB_SHARED_LIB=Off -DFLB_DEBUG=On -DFLB_ALL=On -DFLB_EXAMPLES=Off"
100+
CLANG_PKG: ${{ matrix.os.clang }}
92101

93102
- name: Display dependencies w/ ldd
94103
run: |
@@ -98,8 +107,15 @@ jobs:
98107
echo "$ldd_result" | grep libcares
99108
echo "$ldd_result" | grep libjemalloc
100109
echo "$ldd_result" | grep libluajit
101-
echo "$ldd_result" | grep libmsgpack
102110
echo "$ldd_result" | grep libnghttp2
103111
echo "$ldd_result" | grep libsqlite3
104112
echo "$ldd_result" | grep libzstd
105113
working-directory: build
114+
115+
- name: Display dependencies w/ ldd for libmsgpack
116+
if: matrix.os.version == 'ubuntu-24.04'
117+
run: |
118+
export ldd_result=$(ldd ./bin/fluent-bit)
119+
echo "ldd result:"
120+
echo "$ldd_result" | grep libmsgpack
121+
working-directory: build

0 commit comments

Comments
 (0)