From f9ae5d286e395cb4aa6c092a92c61c6c58b9a098 Mon Sep 17 00:00:00 2001 From: devel Date: Tue, 10 Oct 2023 13:37:38 +0200 Subject: [PATCH] updated workflows, updated readme --- .ci/build.sh | 12 ------- .ci/install.sh | 46 ------------------------- .github/workflows/ros_build_test.yml | 2 +- .github/workflows/ros_package_build.yml | 2 +- README.md | 4 +++ 5 files changed, 6 insertions(+), 60 deletions(-) delete mode 100755 .ci/build.sh delete mode 100755 .ci/install.sh diff --git a/.ci/build.sh b/.ci/build.sh deleted file mode 100755 index 16e7dfa..0000000 --- a/.ci/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e - -distro=`lsb_release -r | awk '{ print $2 }'` -[ "$distro" = "18.04" ] && ROS_DISTRO="melodic" -[ "$distro" = "20.04" ] && ROS_DISTRO="noetic" - -echo "Starting build" -cd ~/mrs_workspace -source /opt/ros/$ROS_DISTRO/setup.bash -catkin build --limit-status-rate 0.2 --summarize -echo "Ended build" diff --git a/.ci/install.sh b/.ci/install.sh deleted file mode 100755 index 746a8fa..0000000 --- a/.ci/install.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -set -e - -distro=`lsb_release -r | awk '{ print $2 }'` -[ "$distro" = "18.04" ] && ROS_DISTRO="melodic" -[ "$distro" = "20.04" ] && ROS_DISTRO="noetic" - -# get the path to this script -MY_PATH=`pwd` - -echo "Starting install" - -# get the current package name -PACKAGE_NAME=${PWD##*/} - -sudo apt-get -y install git - -echo "installing uav_core" -cd -git clone https://github.com/ctu-mrs/uav_core -cd uav_core -./installation/install.sh -gitman update - -echo "installing simulation" -cd -git clone https://github.com/ctu-mrs/simulation -cd simulation -./installation/install.sh -gitman update - -# link the up-to-date version of this package -rm -rf ~/simulation/.gitman/$PACKAGE_NAME -ln -s "$MY_PATH" ~/simulation/.gitman/$PACKAGE_NAME - -echo "creating workspace" -mkdir -p ~/mrs_workspace/src -cd ~/mrs_workspace/src -ln -s ~/simulation -ln -s ~/uav_core/ros_packages/mavros -ln -s ~/uav_core/ros_packages/mrs_msgs -source /opt/ros/$ROS_DISTRO/setup.bash -cd ~/mrs_workspace -catkin init - -echo "install part ended" diff --git a/.github/workflows/ros_build_test.yml b/.github/workflows/ros_build_test.yml index f6f91cf..28768ce 100644 --- a/.github/workflows/ros_build_test.yml +++ b/.github/workflows/ros_build_test.yml @@ -9,7 +9,7 @@ on: - '**/README.md' pull_request: - branches: [ hw_api ] + branches: [ master ] workflow_dispatch: diff --git a/.github/workflows/ros_package_build.yml b/.github/workflows/ros_package_build.yml index d3bb22c..d17da2a 100644 --- a/.github/workflows/ros_package_build.yml +++ b/.github/workflows/ros_package_build.yml @@ -3,7 +3,7 @@ name: ros_package_build on: push: - branches: [ hw_api ] + branches: [ master ] paths-ignore: - '**/README.md' diff --git a/README.md b/README.md index 5c15b98..8455d4b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # MRS resources for Gazebo +> :warning: **Attention please: This README is outdated.** +> +> The MRS UAV System 1.5 is being released and this page needs updating. Please, keep in mind that the information on this page might not be valid. + This package contains common gazebo files (worlds, models and plugins) for the [MRS UAV system](https://github.com/ctu-mrs/mrs_uav_system). ## Worlds