From 6280465654c771edf0477557170c5611105b67aa Mon Sep 17 00:00:00 2001 From: Steve Macenski Date: Tue, 27 May 2025 22:07:36 -0700 Subject: [PATCH 1/2] Removing underlay workspace from Main (#5200) Signed-off-by: Steve Macenski --- tools/underlay.repos | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/underlay.repos b/tools/underlay.repos index 0969fc46967..eddf104573e 100644 --- a/tools/underlay.repos +++ b/tools/underlay.repos @@ -1,8 +1,8 @@ repositories: - BehaviorTree/BehaviorTree.CPP: - type: git - url: https://github.com/BehaviorTree/BehaviorTree.CPP.git - version: 4.6.2 + # BehaviorTree/BehaviorTree.CPP: + # type: git + # url: https://github.com/BehaviorTree/BehaviorTree.CPP.git + # version: 4.6.2 # ros/angles: # type: git # url: https://github.com/ros/angles.git From 7697879286e159797631de2c5b369c3bbbcd9aa5 Mon Sep 17 00:00:00 2001 From: mini-1235 Date: Thu, 27 Nov 2025 11:58:39 +0000 Subject: [PATCH 2/2] Try updating key to avoid building with cache Signed-off-by: mini-1235 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa8ddde8860..641b252b3da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,12 +33,12 @@ _commands: - restore_cache: name: Restore Cache << parameters.key >> keys: - - "<< parameters.key >>-v42\ + - "<< parameters.key >>-v43\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ -{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}" - - "<< parameters.key >>-v42\ + - "<< parameters.key >>-v43\ -{{ arch }}\ -main\ -\ @@ -58,7 +58,7 @@ _commands: steps: - save_cache: name: Save Cache << parameters.key >> - key: "<< parameters.key >>-v42\ + key: "<< parameters.key >>-v43\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\