From 915b27aeb7ff148ab49b4f44494b55d0b8ee5817 Mon Sep 17 00:00:00 2001 From: Harri Makelin Date: Mon, 12 Aug 2024 20:21:12 +0100 Subject: [PATCH 1/2] Fix make build in case of no staged or unstaged changes --- debian/gisnav/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/gisnav/Makefile b/debian/gisnav/Makefile index a7b3f20a..b8e7af8d 100644 --- a/debian/gisnav/Makefile +++ b/debian/gisnav/Makefile @@ -91,5 +91,9 @@ $(BUILD_DIR)/etc/gisnav: @git clone --depth 1 file://${REPO_ROOT_PATH} $@ @cd ${REPO_ROOT_PATH} && git diff --cached > /tmp/gisnav-diff.patch \ && git diff >> /tmp/gisnav-diff.patch - @cd $@ && git apply /tmp/gisnav-diff.patch + @if [ -s /tmp/gisnav-diff.patch ]; then \ + cd $@ && git apply /tmp/gisnav-diff.patch; \ + else \ + echo "No changes to apply."; \ + fi @rm -rf /tmp/gisnav-diff.patch From 180562169ab17d57335137a699ab0cfff1ee0143 Mon Sep 17 00:00:00 2001 From: Harri Makelin Date: Mon, 12 Aug 2024 20:53:08 +0100 Subject: [PATCH 2/2] Update version to v0.68.1 [skip ci] --- docs/sphinx/source/conf.py | 2 +- docs/vitepress/docs/shared/clone-to-colcon-workspace.md | 2 +- docs/vitepress/docs/shared/install-debian.md | 2 +- ros/gisnav/package.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py index fcc1232a..7e1694f5 100644 --- a/docs/sphinx/source/conf.py +++ b/docs/sphinx/source/conf.py @@ -14,7 +14,7 @@ project = "GISNav" copyright = "2024, Harri Makelin" author = "Harri Makelin" -release = "v0.68.0" +release = "v0.68.1" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/docs/vitepress/docs/shared/clone-to-colcon-workspace.md b/docs/vitepress/docs/shared/clone-to-colcon-workspace.md index c238c795..79fd7925 100644 --- a/docs/vitepress/docs/shared/clone-to-colcon-workspace.md +++ b/docs/vitepress/docs/shared/clone-to-colcon-workspace.md @@ -2,7 +2,7 @@ Clone latest version of GISNav and dependencies to colcon workspace: ```bash cd ~/colcon_ws/src -git clone --branch v0.68.0 https://github.com/hmakelin/gisnav.git +git clone --branch v0.68.1 https://github.com/hmakelin/gisnav.git git clone --branch 2.8.0 https://github.com/mavlink/mavros.git git clone --branch release/1.14 https://github.com/px4/px4_msgs.git ``` diff --git a/docs/vitepress/docs/shared/install-debian.md b/docs/vitepress/docs/shared/install-debian.md index c56d08d2..10ffe84e 100644 --- a/docs/vitepress/docs/shared/install-debian.md +++ b/docs/vitepress/docs/shared/install-debian.md @@ -6,7 +6,7 @@ You can make this process quicker by building your own (potentially cross-platfo ::: ```bash -GISNAV_RELEASE=v0.68.0 +GISNAV_RELEASE=v0.68.1 wget https://github.com/hmakelin/gisnav/releases/download/${GISNAV_RELEASE}/gisnav-${GISNAV_RELEASE}_all.deb -O gisnav-${GISNAV_RELEASE}_all.deb sudo dpkg -i ./gisnav-${GISNAV_RELEASE}_all.deb ``` diff --git a/ros/gisnav/package.xml b/ros/gisnav/package.xml index 4f53553b..083641f7 100644 --- a/ros/gisnav/package.xml +++ b/ros/gisnav/package.xml @@ -2,7 +2,7 @@ gisnav - 0.68.0 + 0.68.1 Estimates airborne drone global position by matching video to map retrieved from onboard GIS server. Harri Makelin Harri Makelin