@@ -33,15 +33,14 @@ jobs:
3333 export LIBGL_ALWAYS_SOFTWARE=true
3434 xvfb-run --auto-servernum make webots_target -j4
3535 build :
36- if : ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
36+ if : ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
3737 strategy :
3838 fail-fast : false
3939 matrix :
4040 os : [ubuntu-20.04, ubuntu-22.04]
4141 include :
4242 - os : ubuntu-20.04
4343 JAVA_VERSION : " 16"
44- ROS_DISTRO : " noetic"
4544 - os : ubuntu-22.04
4645 JAVA_VERSION : " 18"
4746 runs-on : ${{ matrix.os }}
6261 export JAVA_HOME=/usr/lib/jvm/java-${{ matrix.JAVA_VERSION }}-openjdk-amd64
6362 export PATH=$JAVA_HOME/bin:$PATH
6463 export LIBGL_ALWAYS_SOFTWARE=true
65- export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
6664 xvfb-run --auto-servernum make distrib -j4
6765 - name : Create/Update GitHub release
6866 if : ${{ matrix.os == 'ubuntu-20.04' && (github.event_name == 'push' || github.event_name == 'schedule') }}
@@ -71,14 +69,14 @@ jobs:
7169 pip install pyopenssl --upgrade
7270 scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
7371 - uses : actions/upload-artifact@v4
74- if : ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
72+ if : ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
7573 with :
7674 name : build-${{ matrix.os }}
7775 path : |
7876 distribution/*.tar.bz2
7977 distribution/*.zip
8078 - uses : actions/upload-artifact@v4
81- if : ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test ros') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
79+ if : ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
8280 with :
8381 name : build-${{ matrix.os }}
8482 path : |
@@ -105,7 +103,7 @@ jobs:
105103 - name : Extract Webots
106104 run : tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
107105 - name : Install Webots Dependencies
108- run : sudo scripts/install/linux_test_dependencies.sh --exclude-ros
106+ run : sudo scripts/install/linux_test_dependencies.sh
109107 - name : Set up Python 3.9
110108 uses : actions/setup-python@v2
111109 with :
@@ -119,45 +117,6 @@ jobs:
119117 export TESTS_HOME=$PWD # required by cache group in the test suite
120118 export BRANCH_HASH=$(git log -1 --format='%H')
121119 xvfb-run --auto-servernum python tests/test_suite.py
122- test-ros :
123- needs : build
124- if : ${{ contains(github.event.pull_request.labels.*.name, 'test ros') || github.event_name == 'schedule' }}
125- strategy :
126- fail-fast : false
127- matrix :
128- os : [ubuntu-20.04]
129- include :
130- - os : ubuntu-20.04
131- ROS_DISTRO : noetic
132- python : 3.8
133- runs-on : ${{ matrix.os }}
134- steps :
135- - uses : actions/checkout@v3
136- with :
137- submodules : true
138- ref : develop
139- - name : Download Artifacts
140- 141- with :
142- name : build-${{ matrix.os }}
143- path : artifact
144- - name : Extract Webots
145- run : tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
146- - name : Install Webots Dependencies
147- run : sudo scripts/install/linux_test_dependencies.sh
148- - name : Set up Python ${{ matrix.python }}
149- uses : actions/setup-python@v2
150- with :
151- python-version : ${{ matrix.python }}
152- - name : Run Test
153- run : |
154- export WEBOTS_HOME=$PWD/artifact/webots
155- export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
156- python -m pip install rospkg catkin_pkg empy defusedxml netifaces
157- Xvfb :99 &
158- export DISPLAY=:99
159- ./tests/ros.sh
160- timeout-minutes : 15
161120 test-worlds :
162121 needs : build
163122 if : ${{ contains(github.event.pull_request.labels.*.name, 'test worlds') || github.event_name == 'schedule' }}
@@ -194,7 +153,7 @@ jobs:
194153 xvfb-run --auto-servernum python3 tests/test_worlds.py
195154 if [[ "$(diff -qr artifact/ untouched-artifact/ | wc -l)" -ne "0" ]]; then echo Some world and/or wbproj files are not up to date: "$(diff -qr artifact/ untouched-artifact/)"; exit 1; fi
196155 delete-artifacts :
197- needs : [build, test-suite, test-ros, test- worlds]
156+ needs : [build, test-suite, test-worlds]
198157 if : ${{ always() && !contains(github.event.pull_request.labels.*.name, 'test distribution') && !contains(github.event.pull_request.labels.*.name, 'test webots build') }}
199158 strategy :
200159 matrix :
0 commit comments