diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml index 84f52b75a8..f152e93059 100644 --- a/.github/workflows/ci-pipeline-arm64.yml +++ b/.github/workflows/ci-pipeline-arm64.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: cc: [gcc, clang] - os: ['ubuntu_18.04', 'rocky_linux_8'] + os: ['rocky_linux_8'] steps: - uses: OpenDataPlane/action-clean-up@main - uses: actions/checkout@v3 @@ -174,7 +174,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu_18.04', 'ubuntu_22.04'] + os: ['ubuntu_22.04'] steps: - uses: OpenDataPlane/action-clean-up@main - uses: actions/checkout@v3 diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 8124e37530..2cef615ebc 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -128,22 +128,6 @@ jobs: - if: ${{ failure() }} uses: ./.github/actions/build-failure-log - Build_arm64_u18: - runs-on: ubuntu-20.04 - env: - ARCH: arm64 - OS: ubuntu_18.04 - strategy: - fail-fast: false - matrix: - cc: [gcc, clang] - steps: - - uses: actions/checkout@v3 - - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" - -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/build_${ARCH}.sh - - if: ${{ failure() }} - uses: ./.github/actions/build-failure-log - Build_armhf: runs-on: ubuntu-20.04 env: @@ -225,10 +209,10 @@ jobs: - if: ${{ failure() }} uses: ./.github/actions/build-failure-log - Build_gcc_u18: + Build_gcc_u20: runs-on: ubuntu-20.04 env: - OS: ubuntu_18.04 + OS: ubuntu_20.04 strategy: fail-fast: false matrix: @@ -321,7 +305,7 @@ jobs: fail-fast: false matrix: cc: [gcc, clang] - os: ['ubuntu_18.04', 'ubuntu_22.04'] + os: ['ubuntu_22.04'] steps: - uses: actions/checkout@v3 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e ARCH="${ARCH}"