From 7a7e0ff41ebea0afff22d7f8a2e50448bb8c34db Mon Sep 17 00:00:00 2001 From: Jan Staschulat Date: Wed, 28 Jul 2021 12:05:36 +0200 Subject: [PATCH 1/2] Fix codecov to ignore unit tests and rclc_examples package (#155) (cherry picked from commit 359c265def31369c822d83cc96825a3247b344e5) # Conflicts: # codecov.yml --- codecov.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 7f8e3957..59916074 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,4 +1,11 @@ +fixes: + - "ros_ws/src/*/rclc::" ignore: - - "rclc_examples/**/*" - "rclc/test/**/*" +<<<<<<< HEAD - "rclc_lifecycle/test/**/*" +======= + - "rclc_examples/**/*" + - "rclc_lifecycle/test/*" + - "rclc_parameter/test/**/*" +>>>>>>> 359c265 (Fix codecov to ignore unit tests and rclc_examples package (#155)) From 6e50b862757f34226cac662ebba1ae3907894739 Mon Sep 17 00:00:00 2001 From: Jan Staschulat Date: Wed, 28 Jul 2021 12:10:15 +0200 Subject: [PATCH 2/2] resolved merge conflict - removed rclc_parameters Signed-off-by: Jan Staschulat --- codecov.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/codecov.yml b/codecov.yml index 59916074..57a5b67e 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,10 +2,5 @@ fixes: - "ros_ws/src/*/rclc::" ignore: - "rclc/test/**/*" -<<<<<<< HEAD - - "rclc_lifecycle/test/**/*" -======= - "rclc_examples/**/*" - "rclc_lifecycle/test/*" - - "rclc_parameter/test/**/*" ->>>>>>> 359c265 (Fix codecov to ignore unit tests and rclc_examples package (#155))