From 96f76fdfa8415e2dee91f7a0bc1d29ccbf5aee17 Mon Sep 17 00:00:00 2001 From: Leon De Andrade Date: Wed, 14 Feb 2024 11:00:14 +0100 Subject: [PATCH 1/4] Upgrade submodules (#5) --- submodules/internal/map-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/internal/map-service b/submodules/internal/map-service index 381e085..4cdc539 160000 --- a/submodules/internal/map-service +++ b/submodules/internal/map-service @@ -1 +1 @@ -Subproject commit 381e085824657894e903adb4728faf3728c31d0e +Subproject commit 4cdc539cd26cc4a9df91d85ae5ba7113adfb7aa0 From 9bef7f24f2e206bc6507aed935ae6f60f0163e1c Mon Sep 17 00:00:00 2001 From: Leon De Andrade Date: Wed, 14 Feb 2024 12:53:41 +0100 Subject: [PATCH 2/4] Update Map Service dependency --- submodules/internal/map-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/internal/map-service b/submodules/internal/map-service index 4cdc539..381e085 160000 --- a/submodules/internal/map-service +++ b/submodules/internal/map-service @@ -1 +1 @@ -Subproject commit 4cdc539cd26cc4a9df91d85ae5ba7113adfb7aa0 +Subproject commit 381e085824657894e903adb4728faf3728c31d0e From abc945fa7f6263e81d71e4b74b661be0e857bba3 Mon Sep 17 00:00:00 2001 From: Leon De Andrade Date: Wed, 14 Feb 2024 14:33:29 +0100 Subject: [PATCH 3/4] Revert "Update Map Service dependency" This reverts commit 9bef7f24f2e206bc6507aed935ae6f60f0163e1c. --- submodules/internal/map-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/internal/map-service b/submodules/internal/map-service index 381e085..4cdc539 160000 --- a/submodules/internal/map-service +++ b/submodules/internal/map-service @@ -1 +1 @@ -Subproject commit 381e085824657894e903adb4728faf3728c31d0e +Subproject commit 4cdc539cd26cc4a9df91d85ae5ba7113adfb7aa0 From ec304c1732544362fbb6b06636c08086e508d7e5 Mon Sep 17 00:00:00 2001 From: Leon De Andrade Date: Wed, 14 Feb 2024 15:12:33 +0100 Subject: [PATCH 4/4] Update map version --- .github/workflows/main.yml | 4 ++-- README.md | 2 +- src/dsd_rail_horizon_core/tests/MapDBReaderTest.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4982994..f3c24a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ on: - '**' env: - DB_MAP_VERSION: 12 + DB_MAP_VERSION: 63 DB_MAP_ENDPOINT: DB_LAN DB_MAP_CATALOG: validate.s4r2.oss.4 PERSISTENT_STORAGE_ROOT_DIR: ${{ github.workspace }}/map_data @@ -54,7 +54,7 @@ jobs: run: | source /opt/ros/humble/setup.bash && source ./install/local_setup.bash colcon test --packages-select dsd_rail_horizon dsd_rail_horizon_core dsd_mission_profile --ctest-arg -E "overTheAirUpdateIsSucessfull" - + - name: Print test results run: | source /opt/ros/humble/setup.bash && source ./install/local_setup.bash diff --git a/README.md b/README.md index a200c9d..b5954ed 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Some environment variables need to be set for the map service: ```bash export RMW_IMPLEMENTATION=rmw_fastrtps_cpp export PERSISTENT_STORAGE_ROOT_DIR=~/documents/maps -export DB_MAP_VERSION=12 +export DB_MAP_VERSION=63 export DB_MAP_ENDPOINT=DBMC export DB_MAP_CATALOG=validate.s4r2.oss.4 ``` diff --git a/src/dsd_rail_horizon_core/tests/MapDBReaderTest.cpp b/src/dsd_rail_horizon_core/tests/MapDBReaderTest.cpp index fefdd40..d96a90b 100644 --- a/src/dsd_rail_horizon_core/tests/MapDBReaderTest.cpp +++ b/src/dsd_rail_horizon_core/tests/MapDBReaderTest.cpp @@ -127,7 +127,7 @@ class MapDBReaderFixture : public ::testing::Test std::filesystem::path map_service_map_data_dir{MAP_PATH}; // MAP_PATH is defined by us in cmake as a macro std::string catalog = "validate.s4r2.oss.4"; - std::size_t version = 12; + std::size_t version = 63; std::filesystem::path temp_map_dir; };