From 80f53978d6852749b7471f3bbeaba537f20e45c9 Mon Sep 17 00:00:00 2001 From: Tomas Baca Date: Fri, 28 Jul 2023 20:56:09 +0200 Subject: [PATCH] wip --- .ci/build.sh | 3 +-- .github/workflows/build.yml | 8 ++++---- .gitignore | 4 ++++ packages.yaml | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.ci/build.sh b/.ci/build.sh index b901a85502..0bd6179dff 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -45,9 +45,8 @@ echo "$REPOS" | while IFS= read -r REPO; do URL=$(echo "$REPO" | awk '{print $2}') BRANCH=$(echo "$REPO" | awk '{print $3}') - git clone $URL $PACKAGE + git clone $URL --branch $BRANCH $PACKAGE cd $PACKAGE - git checkout $BRANCH git submodule update --init --recursive cd $WORKSPACE/src diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59e54960fd..d8e2d00f36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,11 +2,11 @@ name: ros_package_build on: - push: - branches: [ master ] + # push: + # branches: [ master ] - pull_request: - branches: [ master ] + # pull_request: + # branches: [ master ] workflow_dispatch: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..ce9adb2789 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.swo +*.swp + +act.sh diff --git a/packages.yaml b/packages.yaml index bb3feb974d..62be2bfcf8 100644 --- a/packages.yaml +++ b/packages.yaml @@ -88,9 +88,9 @@ mrs_uav_trajectory_generation: unstable_ref: hw_api_ci stable_ref: release -mrs_uav_rviz_plugins: +mrs_rviz_plugins: architecture: [x86_64, aarch64] - source: https://github.com/ctu-mrs/mrs_uav_rviz_plugins + source: https://github.com/ctu-mrs/mrs_rviz_plugins unstable_ref: hw_api_ci stable_ref: release