Skip to content

Commit e37a107

Browse files
committed
Test in CI
Test in CI
1 parent 6cf1da2 commit e37a107

File tree

1 file changed

+16
-35
lines changed

1 file changed

+16
-35
lines changed

.github/workflows/build.yaml

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -611,35 +611,9 @@ jobs:
611611
working-directory: ${{env.DispatchBuildDir}}
612612
run: ctest -VV -R python-checker
613613

614-
container:
615-
name: Container image
616-
runs-on: ubuntu-latest
617-
steps:
618-
619-
- uses: actions/checkout@v3
620-
621-
- name: Build Containerfile
622-
run: |
623-
docker build -t local/skupper-router:local -f ./Containerfile .
624-
625-
- uses: actions-rs/toolchain@v1
626-
with:
627-
profile: minimal
628-
toolchain: stable
629-
630-
- uses: Swatinem/rust-cache@v1
631-
632-
- uses: actions-rs/cargo@v1
633-
with:
634-
command: test
635-
args: -- --nocapture
636-
env:
637-
QDROUTERD_IMAGE: local/skupper-router:local
638-
RUST_BACKTRACE: 1
639-
640-
rpm:
641-
name: 'Build and test RPM (${{ matrix.container }}:${{ matrix.containerTag }})'
642-
runs-on: '${{ matrix.os }}'
614+
clang:
615+
name: 'Clang (${{ matrix.os }})'
616+
runs-on: ${{ matrix.os }}
643617
strategy:
644618
matrix:
645619
os: [ 'ubuntu-20.04' ]
@@ -664,10 +638,12 @@ jobs:
664638
665639
- uses: actions/checkout@v3
666640

667-
- name: Deploy the spec.rpkg file to /
668-
run: ln -s packaging/skupper-router.spec.rpkg ./
641+
- name: Install latest stable Clang
642+
run: |
643+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
669644
670-
- name: Install build dependencies (2/2)
645+
- name: Install Linux build dependencies
646+
if: ${{ runner.os == 'Linux' }}
671647
run: |
672648
rpkg spec --outdir /tmp/rpkg
673649
dnf builddep --setopt=tsflags=nodocs --setopt=install_weak_deps=False -y /tmp/rpkg/skupper-router.spec
@@ -677,9 +653,14 @@ jobs:
677653
mkdir /tmp/skupper-rpms
678654
rpkg local --nocheck --outdir /tmp/skupper-rpms
679655
680-
- name: Install built packages
681-
run: |
682-
dnf install -y /tmp/skupper-rpms/*/*.rpm
656+
- name: skupper-router cmake configure
657+
working-directory: ${{env.RouterBuildDir}}
658+
run: >
659+
cmake "${{github.workspace}}" \
660+
"-DCMAKE_C_COMPILER=clang" \
661+
"-DCMAKE_CXX_COMPILER=clang++" \
662+
"-DCMAKE_INSTALL_PREFIX=${InstallPrefix}" \
663+
${RouterCMakeExtraArgs}
683664
684665
- name: Check skrouterd version
685666
run: |

0 commit comments

Comments
 (0)