@@ -611,35 +611,9 @@ jobs:
611
611
working-directory : ${{env.DispatchBuildDir}}
612
612
run : ctest -VV -R python-checker
613
613
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 }}
643
617
strategy :
644
618
matrix :
645
619
os : [ 'ubuntu-20.04' ]
@@ -664,10 +638,12 @@ jobs:
664
638
665
639
- uses : actions/checkout@v3
666
640
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)"
669
644
670
- - name : Install build dependencies (2/2)
645
+ - name : Install Linux build dependencies
646
+ if : ${{ runner.os == 'Linux' }}
671
647
run : |
672
648
rpkg spec --outdir /tmp/rpkg
673
649
dnf builddep --setopt=tsflags=nodocs --setopt=install_weak_deps=False -y /tmp/rpkg/skupper-router.spec
@@ -677,9 +653,14 @@ jobs:
677
653
mkdir /tmp/skupper-rpms
678
654
rpkg local --nocheck --outdir /tmp/skupper-rpms
679
655
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}
683
664
684
665
- name : Check skrouterd version
685
666
run : |
0 commit comments