Skip to content

Commit e4fdb4a

Browse files
committed
.github: Added back OSG and OSGEarth support.
1 parent cd192af commit e4fdb4a

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

.github/workflows/chart-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
3939
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
4040
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
41+
libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
4142
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4243
python3-scipy python3-seaborn python3-posix-ipc
4344
echo "::endgroup::"
@@ -59,7 +60,7 @@ jobs:
5960
echo "::endgroup::"
6061

6162
echo "::group::Running chart tests"
62-
inet_run_chart_tests -m release -f showcases --exclude-filter /osg/
63+
inet_run_chart_tests -m release -f showcases
6364
echo "::endgroup::"
6465
- uses: actions/upload-artifact@v3
6566
if: always() # even if the test failed, of course

.github/workflows/fingerprint-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
echo "::group::Installing packages"
6262
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
6363
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
64-
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
64+
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
65+
libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
66+
python3
6567
echo "::endgroup::"
6668
6769
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

.github/workflows/native-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
echo "::group::Installing packages"
3939
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
4040
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
41-
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev python3
41+
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
42+
libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
43+
python3
4244
echo "::endgroup::"
4345
4446
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

.github/workflows/statistical-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
3939
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
4040
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
41+
libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
4142
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4243
python3-scipy python3-seaborn python3-posix-ipc
4344
echo "::endgroup::"
@@ -59,7 +60,7 @@ jobs:
5960
echo "::endgroup::"
6061

6162
echo "::group::Running statistical tests"
62-
inet_run_statistical_tests -m release --exclude-filter /osg/
63+
inet_run_statistical_tests -m release
6364
echo "::endgroup::"
6465
- uses: actions/upload-artifact@v3
6566
if: always() # even if the test failed, of course

.github/workflows/validation-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
sudo apt-get install -y --no-install-recommends git wget curl ca-certificates \
3939
make ccache clang lld gdb bison flex perl doxygen graphviz libxml2-dev zlib1g-dev \
4040
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
41+
libopenscenegraph-dev openscenegraph-plugin-osgearth libosgearth-dev \
4142
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4243
python3-scipy python3-seaborn python3-posix-ipc
4344
echo "::endgroup::"
@@ -55,5 +56,5 @@ jobs:
5556
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
5657
5758
echo "::group::Running validation tests"
58-
inet_run_validation_tests -m release --exclude-filter /osg/
59+
inet_run_validation_tests -m release
5960
echo "::endgroup::"

_scripts/github/build-omnetpp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cp configure.user.dist configure.user
2020
echo "::endgroup::"
2121

2222
echo "::group::Configuring omnetpp"
23-
./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=no WITH_OSGEARTH=no
23+
./configure WITH_LIBXML=yes WITH_QTENV=no WITH_OSG=yes WITH_OSGEARTH=yes
2424
echo "::endgroup::"
2525

2626
echo "::group::Compiling omnetpp"

0 commit comments

Comments
 (0)