diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa2aa77..e6433ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,6 @@ jobs: matrix: ros: [iron] #, rolling] include: - # - os: ubuntu-22.04 - # ros: humble - # python: python3 - os: ubuntu-22.04 ros: iron python: python3 diff --git a/.travis.yml b/.travis.yml index 81c7227..3b62d89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: generic jobs: include: - dist: jessie - env: ROS_DISTRO=humble PYTHON=python3 + env: ROS_DISTRO=iron PYTHON=python3 before_install: - ln -s $PWD ~/flexbe_ci diff --git a/ci_scripts/run_devel_tests.bash b/ci_scripts/run_devel_tests.bash index 6c3508e..e69e9fc 100644 --- a/ci_scripts/run_devel_tests.bash +++ b/ci_scripts/run_devel_tests.bash @@ -7,7 +7,8 @@ cd ~/colcon_ws rm -rf install build log colcon build --symlink-install source ~/colcon_ws/install/setup.bash -ros2 run flexbe_app nwjs_install -xvfb-run ros2 run flexbe_app run_app --offline --run-tests +# Skip flexbe_app tests with pending release of flexbe_webui +# ros2 run flexbe_app nwjs_install +# xvfb-run ros2 run flexbe_app run_app --offline --run-tests colcon test --ctest-args tests colcon test-result --all diff --git a/ci_scripts/run_install_tests.bash b/ci_scripts/run_install_tests.bash index 30f2fd6..33f7744 100644 --- a/ci_scripts/run_install_tests.bash +++ b/ci_scripts/run_install_tests.bash @@ -7,7 +7,8 @@ cd ~/colcon_ws rm -rf install build log colcon build source ~/colcon_ws/install/setup.bash -ros2 run flexbe_app nwjs_install -xvfb-run ros2 run flexbe_app run_app --offline --run-tests +# Skip flexbe_app tests with pending release of flexbe_webui +# ros2 run flexbe_app nwjs_install +# xvfb-run ros2 run flexbe_app run_app --offline --run-tests colcon test --ctest-args tests colcon test-result --all diff --git a/ci_scripts/script.bash b/ci_scripts/script.bash index 8d5edd6..7c4c7ae 100644 --- a/ci_scripts/script.bash +++ b/ci_scripts/script.bash @@ -17,7 +17,8 @@ cd ~/colcon_ws rm -rf install build log colcon build source ~/colcon_ws/install/setup.bash -ros2 run flexbe_app nwjs_install -xvfb-run ros2 run flexbe_app run_app --offline --run-tests +# Skip flexbe_app tests with pending release of flexbe_webui +# ros2 run flexbe_app nwjs_install +# xvfb-run ros2 run flexbe_app run_app --offline --run-tests colcon test --ctest-args tests colcon test-result --all diff --git a/rosinstall/flexbe_app.rosinstall b/rosinstall/flexbe_app.not_install similarity index 100% rename from rosinstall/flexbe_app.rosinstall rename to rosinstall/flexbe_app.not_install