Skip to content

Commit 3935038

Browse files
Fixing CI Cache Misalignment causing builds to fail (#5607)
* Aligning caches Signed-off-by: SteveMacenski <stevenmacenski@gmail.com> * Trigger linting (hopefully) Signed-off-by: SteveMacenski <stevenmacenski@gmail.com> * Fix action-ros-lint version format in lint.yml Signed-off-by: Steve Macenski <stevenmacenski@gmail.com> --------- Signed-off-by: SteveMacenski <stevenmacenski@gmail.com> Signed-off-by: Steve Macenski <stevenmacenski@gmail.com>
1 parent 568174c commit 3935038

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

.circleci/config.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ _commands:
5858
steps:
5959
- save_cache:
6060
name: Save Cache << parameters.key >>
61-
key: "<< parameters.key >>-v39\
61+
key: "<< parameters.key >>-v40\
6262
-{{ arch }}\
6363
-{{ .Branch }}\
6464
-{{ .Environment.CIRCLE_PR_NUMBER }}\
@@ -519,7 +519,12 @@ jobs:
519519
- build_source:
520520
packages_skip_regex: << parameters.packages_skip_regex >>
521521
system_build: &system_build
522-
<<: *release_build
522+
<<: *job_build
523+
executor: release_exec
524+
steps:
525+
- restore_build
526+
- build_source:
527+
packages_skip_regex: << parameters.packages_skip_regex >>
523528
release_test: &release_test
524529
<<: *job_test
525530
executor: release_exec
@@ -531,33 +536,40 @@ jobs:
531536
- report_coverage
532537

533538
_parameters:
534-
release_parameters: &release_parameters
539+
release_build_parameters: &release_build_parameters
535540
packages_skip_regex: "'(nav2_system_tests|nav2_smac_planner|nav2_mppi_controller|nav2_route|nav2_rviz_plugins|nav2_rotation_shim_controller|nav2_waypoint_follower|nav2_smoother|opennav_docking|opennav_following|nav2_behaviors|nav2_bringup|navigation2)'"
541+
system_build_parameters: &system_build_parameters
542+
packages_skip_regex: ""
543+
release_test_parameters: &release_test_parameters
544+
packages_skip_regex: ""
536545

537546
workflows:
538547
version: 2
539548
build_and_test:
540549
jobs:
541550
- release_build:
542-
<<: *release_parameters
551+
<<: *release_build_parameters
543552
- system_build:
553+
<<: *system_build_parameters
544554
requires:
545555
- release_build
546556
- release_test:
557+
<<: *release_test_parameters
547558
requires:
548559
- system_build
549560
cache_test: true
550561
nightly:
551562
jobs:
552563
- release_build:
553-
<<: *release_parameters
564+
<<: *release_build_parameters
554565
- system_build:
566+
<<: *system_build_parameters
555567
requires:
556568
- release_build
557569
- release_test:
558570
requires:
559571
- system_build
560-
<<: *release_parameters
572+
<<: *release_test_parameters
561573
matrix:
562574
alias: release_test
563575
parameters:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: matrix.linter == 'mypy'
2020
run: sudo apt update && sudo apt install -y python3-typeshed
2121

22-
- uses: ros-tooling/action-ros-lint@v0.1
22+
- uses: ros-tooling/action-ros-lint@0.1.4
2323
with:
2424
linter: ${{ matrix.linter }}
2525
distribution: rolling

0 commit comments

Comments
 (0)