.github: Added back OSG and OSGEarth support.

inet-framework · Apr 17, 2023 · e4fdb4a · e4fdb4a
1 parent cd192af
commit e4fdb4a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml
@@ -38,6 +38,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
             make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
             libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
+            libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
             python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
             python3-scipy python3-seaborn python3-posix-ipc
           echo "::endgroup::"
@@ -59,7 +60,7 @@ jobs:
           echo "::endgroup::"
 
           echo "::group::Running chart tests"
-          inet_run_chart_tests -m release -f showcases --exclude-filter /osg/
+          inet_run_chart_tests -m release -f showcases
           echo "::endgroup::"
       - uses: actions/upload-artifact@v3
         if: always() # even if the test failed, of course

diff --git a/.github/workflows/fingerprint-tests.yml b/.github/workflows/fingerprint-tests.yml
@@ -61,7 +61,9 @@ jobs:
           echo "::group::Installing packages"
           sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
             make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
-            libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
+            libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
+            libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
+            python3
           echo "::endgroup::"
  
           source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

diff --git a/.github/workflows/native-build.yml b/.github/workflows/native-build.yml
@@ -38,7 +38,9 @@ jobs:
           echo "::group::Installing packages"
           sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
             make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
-            libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
+            libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
+            libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
+            python3
           echo "::endgroup::"
 
           source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

diff --git a/.github/workflows/statistical-tests.yml b/.github/workflows/statistical-tests.yml
@@ -38,6 +38,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
             make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
             libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
+            libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
             python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
             python3-scipy python3-seaborn python3-posix-ipc
           echo "::endgroup::"
@@ -59,7 +60,7 @@ jobs:
           echo "::endgroup::"
 
           echo "::group::Running statistical tests"
-          inet_run_statistical_tests -m release --exclude-filter /osg/
+          inet_run_statistical_tests -m release
           echo "::endgroup::"
       - uses: actions/upload-artifact@v3
         if: always() # even if the test failed, of course

diff --git a/.github/workflows/validation-tests.yml b/.github/workflows/validation-tests.yml
@@ -38,6 +38,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
             make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
             libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
+            libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
             python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
             python3-scipy python3-seaborn python3-posix-ipc
           echo "::endgroup::"
@@ -55,5 +56,5 @@ jobs:
           source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
 
           echo "::group::Running validation tests"
-          inet_run_validation_tests -m release --exclude-filter /osg/
+          inet_run_validation_tests -m release
           echo "::endgroup::"
diff --git a/_scripts/github/build-omnetpp.sh b/_scripts/github/build-omnetpp.sh
@@ -20,7 +20,7 @@ cp configure.user.dist configure.user
 echo "::endgroup::"
 
 echo "::group::Configuring omnetpp"
-./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=no WITH_OSGEARTH=no
+./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=yes WITH_OSGEARTH=yes
 echo "::endgroup::"
 
 echo "::group::Compiling omnetpp"