diff options
| author | Matias Elo <matias.elo@nokia.com> | 2023-08-17 15:39:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-17 15:39:46 +0300 |
| commit | 5d505fde6d4327b27446389699abf3a593c02a17 (patch) | |
| tree | 937164d89e7b8679a42f0e3705e19243baaf0147 /.github | |
| parent | de97121a2e3afa072f7c51a0570f4b3bed0236c2 (diff) | |
| parent | 7a200d709b64e743c002dd9737cd71f54ccc54ac (diff) | |
Merge ODP v1.42.0.0v1.42.0.0_DPDK_22.11
Merge ODP linux-generic v1.42.0.0 into linux-dpdk.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci-pipeline-arm64.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/ci-pipeline.yml | 19 |
2 files changed, 2 insertions, 38 deletions
diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml index b2a7ad042..84f52c1da 100644 --- a/.github/workflows/ci-pipeline-arm64.yml +++ b/.github/workflows/ci-pipeline-arm64.yml @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - cc_ver: [10, 11, 12] + cc_ver: [10, 11, 12, 13] conf: ['', '--enable-abi-compat'] steps: - uses: OpenDataPlane/action-clean-up@main @@ -91,25 +91,6 @@ jobs: if: ${{ failure() }} run: find . -name config.log -exec cat {} \; - Build_gcc_u23: - if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }} - runs-on: [self-hosted, ARM64] - env: - OS: ubuntu_23.04 - strategy: - fail-fast: false - matrix: - cc_ver: [13] - conf: ['', '--enable-abi-compat'] - steps: - - uses: OpenDataPlane/action-clean-up@main - - 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="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh - - name: Failure log - if: ${{ failure() }} - run: find . -name config.log -exec cat {} \; - Build_out-of-tree: if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }} runs-on: [self-hosted, ARM64] diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 87b6d11bf..280e9653e 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -210,7 +210,7 @@ jobs: strategy: fail-fast: false matrix: - cc_ver: [10, 11, 12] + cc_ver: [10, 11, 12, 13] conf: ['', '--enable-abi-compat'] steps: - uses: actions/checkout@v3 @@ -220,23 +220,6 @@ jobs: if: ${{ failure() }} run: find . -name config.log -exec cat {} \; - Build_gcc_u23: - runs-on: ubuntu-20.04 - env: - OS: ubuntu_23.04 - strategy: - fail-fast: false - matrix: - cc_ver: [13] - conf: ['', '--enable-abi-compat'] - 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="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - name: Failure log - if: ${{ failure() }} - run: find . -name config.log -exec cat {} \; - Build_out-of-tree: runs-on: ubuntu-20.04 steps: |