aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2022-10-18 10:04:27 +0300
committerMatias Elo <matias.elo@nokia.com>2022-10-28 15:03:29 +0300
commit5e405de36a0b5e417f186a22c58651de5fbdf718 (patch)
treede7fb10c18731f4a62198ba21eedd556afbd5386 /.github
parent2c808ddb406ad6144cb142c69463476c0fff8f89 (diff)
github_ci: use custom test image for static linking tests
DPDK static linking fails with pkg-config if libpcap is available due to multiple definition errors ('bpf_validate' defined in libpcap.a and librte_bpf.a), so use a separate test image which doesn't include libpcap. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci-pipeline.yml21
1 files changed, 2 insertions, 19 deletions
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index c2a3c31f5..a88d0feb2 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -82,23 +82,6 @@ jobs:
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- Build_static_u20:
- runs-on: ubuntu-20.04
- env:
- OS: ubuntu_20.04
- strategy:
- fail-fast: false
- matrix:
- cc_ver: [9]
- conf: ['--disable-shared', '--enable-lto --disable-shared']
- steps:
- - uses: actions/checkout@v2
- - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
- -e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_static_${ARCH}.sh
- - name: Failure log
- if: ${{ failure() }}
- run: find . -name config.log -exec cat {} \;
-
Build_static_u22:
runs-on: ubuntu-20.04
env:
@@ -107,12 +90,12 @@ jobs:
strategy:
fail-fast: false
matrix:
- cc_ver: [10, 11, 12]
+ cc_ver: [9, 10, 11, 12]
conf: ['', '--enable-lto']
steps:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
- -e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_static_${ARCH}.sh
+ -e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-static /odp/scripts/ci/build_static_${ARCH}.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;