From 4f97fe05d0c938f7f4194197e5fe72e011238742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levente=20M=C3=A9sz=C3=A1ros?= Date: Mon, 17 Apr 2023 16:17:04 +0200 Subject: [PATCH] .github: Added back OSG support. --- .github/workflows/chart-tests.yml | 4 ++-- .github/workflows/fingerprint-tests.yml | 2 +- .github/workflows/native-build.yml | 3 ++- .github/workflows/statistical-tests.yml | 4 ++-- .github/workflows/validation-tests.yml | 4 ++-- _scripts/github/build-omnetpp.sh | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml index 0b40541c67b..acd4bb22eca 100644 --- a/.github/workflows/chart-tests.yml +++ b/.github/workflows/chart-tests.yml @@ -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::" @@ -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 diff --git a/.github/workflows/fingerprint-tests.yml b/.github/workflows/fingerprint-tests.yml index a68dd481c80..f59e0ea60fb 100644 --- a/.github/workflows/fingerprint-tests.yml +++ b/.github/workflows/fingerprint-tests.yml @@ -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 diff --git a/.github/workflows/native-build.yml b/.github/workflows/native-build.yml index 77d4a49c738..a19dd3876b4 100644 --- a/.github/workflows/native-build.yml +++ b/.github/workflows/native-build.yml @@ -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 diff --git a/.github/workflows/statistical-tests.yml b/.github/workflows/statistical-tests.yml index 6e0fa505114..f7dc002575b 100644 --- a/.github/workflows/statistical-tests.yml +++ b/.github/workflows/statistical-tests.yml @@ -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::" @@ -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 diff --git a/.github/workflows/validation-tests.yml b/.github/workflows/validation-tests.yml index ad2a332b017..e37d9760ed9 100644 --- a/.github/workflows/validation-tests.yml +++ b/.github/workflows/validation-tests.yml @@ -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::" @@ -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::" diff --git a/_scripts/github/build-omnetpp.sh b/_scripts/github/build-omnetpp.sh index 73b4702d83e..eef4d1438ff 100755 --- 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=no echo "::endgroup::" echo "::group::Compiling omnetpp"