From 55fec35fdb82356e7952c9c9c3ee7fd7195422f4 Mon Sep 17 00:00:00 2001 From: Tony Najjar Date: Fri, 3 Mar 2023 21:27:48 +0100 Subject: [PATCH] remove changes unrelated to mppi --- .circleci/config.yml | 9 ++++----- .circleci/defaults.yaml | 2 +- codecov.yml | 4 ---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ed07d76e9..2c945e3181 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,12 +33,12 @@ _commands: - restore_cache: name: Restore Cache << parameters.key >> keys: - - "<< parameters.key >>-v13\ + - "<< parameters.key >>-v12\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ -{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}" - - "<< parameters.key >>-v13\ + - "<< parameters.key >>-v12\ -{{ arch }}\ -main\ -\ @@ -58,7 +58,7 @@ _commands: steps: - save_cache: name: Save Cache << parameters.key >> - key: "<< parameters.key >>-v13\ + key: "<< parameters.key >>-v12\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ @@ -453,7 +453,6 @@ executors: release_exec: docker: - image: ghcr.io/ros-planning/navigation2:main - resource_class: large working_directory: /opt/overlay_ws environment: <<: *common_environment @@ -516,4 +515,4 @@ workflows: filters: branches: only: - - main + - main \ No newline at end of file diff --git a/.circleci/defaults.yaml b/.circleci/defaults.yaml index e1d62a04d2..e0d946f78e 100644 --- a/.circleci/defaults.yaml +++ b/.circleci/defaults.yaml @@ -6,7 +6,7 @@ _common: &common "build": <<: *common "executor": "parallel" - "parallel-workers": 4 + "parallel-workers": 2 "symlink-install": true "test": <<: *common diff --git a/codecov.yml b/codecov.yml index 03ba906278..b30da12897 100644 --- a/codecov.yml +++ b/codecov.yml @@ -7,7 +7,3 @@ ignore: - "*/test/**/*" # ignore package test directories, e.g. nav2_costmap_2d/tests - "**/test_*.*" # ignore files starting with test_ e.g. nav2_map_server/test/test_constants.cpp - "**/*_tests.*" # ignore files ending with _tests e.g. nav2_voxel_grid/test/voxel_grid_tests.cpp - - "*/**/benchmark/*" # ignore package test directories, e.g. nav2_dwb_controller/costmap_queue/tests - - "*/benchmark/**/*" # ignore package test directories, e.g. nav2_costmap_2d/tests - - "**/benchmark_*.*" # ignore files starting with test_ e.g. nav2_map_server/test/test_constants.cpp - - "**/*_benchmark.*" # ignore files ending with _tests e.g. nav2_voxel_grid/test/voxel_grid_tests.cpp