Skip to content

Commit 4f97fe0

Browse files
committed
.github: Added back OSG support.
1 parent cd192af commit 4f97fe0

6 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/chart-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "::group::Installing packages"
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 \
40-
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
40+
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
4141
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4242
python3-scipy python3-seaborn python3-posix-ipc
4343
echo "::endgroup::"
@@ -59,7 +59,7 @@ jobs:
5959
echo "::endgroup::"
6060

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

.github/workflows/fingerprint-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ 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 libopenscenegraph-dev python3
6565
echo "::endgroup::"
6666
6767
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

.github/workflows/native-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ 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 python3
4243
echo "::endgroup::"
4344
4445
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh

.github/workflows/statistical-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "::group::Installing packages"
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 \
40-
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
40+
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
4141
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4242
python3-scipy python3-seaborn python3-posix-ipc
4343
echo "::endgroup::"
@@ -59,7 +59,7 @@ jobs:
5959
echo "::endgroup::"
6060

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

.github/workflows/validation-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "::group::Installing packages"
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 \
40-
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev \
40+
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
4141
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
4242
python3-scipy python3-seaborn python3-posix-ipc
4343
echo "::endgroup::"
@@ -55,5 +55,5 @@ jobs:
5555
source $GITHUB_WORKSPACE/inet/_scripts/github/build-inet.sh
5656
5757
echo "::group::Running validation tests"
58-
inet_run_validation_tests -m release --exclude-filter /osg/
58+
inet_run_validation_tests -m release
5959
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=no
2424
echo "::endgroup::"
2525

2626
echo "::group::Compiling omnetpp"

0 commit comments

Comments
 (0)