remove ns3 from ubuntu stable and github actions, as 3.35 is broken on 22.04

diff --git a/.github/workflows/git.yml b/.github/workflows/git.yml
index 5baaa63..ed8af35 100644 (file)
--- a/.github/workflows/git.yml
+++ b/.github/workflows/git.yml
@@ -21,13 +21,12 @@ jobs:
 
       - name: build
         run: |
-          sudo apt-get update && sudo apt-get install ninja-build libboost-dev libboost-context-dev pybind11-dev libns3-dev
+          sudo apt-get update && sudo apt-get install ninja-build libboost-dev libboost-context-dev pybind11-dev
           mkdir build ; cd build
           cmake -GNinja -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
                 -Denable_compile_optimizations=ON -Denable_compile_warnings=ON \
                 -Denable_model-checking=OFF -Denable_smpi_MBI_testsuite=OFF \
                 -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON \
-                -Denable_ns3=ON \
                 -DCMAKE_DISABLE_SOURCE_CHANGES=ON  -DLTO_EXTRA_FLAG="auto" ..
           ninja tests
           ctest --output-on-failure

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 904e14d..d7c4ec6 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -141,11 +141,6 @@ if [ "$os" = "Debian" ] ; then
     have_NS3="yes"
   fi
 fi
-MAY_HINT_AT_NS3=""
-if [ $NODE_NAME = "ubuntu-lts" ] ; then
-  MAY_HINT_AT_NS3="-DNS3_HINT=/builds/ns-3-dev/build/"
-  have_NS3="yes"
-fi
 if [ "$os" = "nixos" ] ; then
   have_NS3="yes"
 fi
@@ -209,7 +204,7 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
   -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
-  -DCMAKE_DISABLE_SOURCE_CHANGES=ON ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \
+  -DCMAKE_DISABLE_SOURCE_CHANGES=ON ${MAY_DISABLE_LTO} \
   -DLTO_EXTRA_FLAG="auto" \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
   "$SRCFOLDER"