Skip to content

Commit

Permalink
.github: Added back OSG support.
Browse files Browse the repository at this point in the history
  • Loading branch information
levy committed Apr 17, 2023
1 parent cd192af commit 4f97fe0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chart-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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 \
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
python3-scipy python3-seaborn python3-posix-ipc
echo "::endgroup::"
Expand All @@ -59,7 +59,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fingerprint-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ 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 python3
echo "::endgroup::"
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/native-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ 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 python3
echo "::endgroup::"
source $GITHUB_WORKSPACE/inet/_scripts/github/build-omnetpp.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/statistical-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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 \
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
python3-scipy python3-seaborn python3-posix-ipc
echo "::endgroup::"
Expand All @@ -59,7 +59,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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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 \
libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libz3-dev libopenscenegraph-dev \
python3 python3-pip python3-pandas python3-numpy python3-matplotlib \
python3-scipy python3-seaborn python3-posix-ipc
echo "::endgroup::"
Expand All @@ -55,5 +55,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::"
2 changes: 1 addition & 1 deletion _scripts/github/build-omnetpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=no
echo "::endgroup::"

echo "::group::Compiling omnetpp"
Expand Down

0 comments on commit 4f97fe0

Please sign in to comment.