Skip to content

Commit 80bb5bf

Browse files
Attempt to fix Rolling 22.04 CI Until 24.04 Comes of Age (#4229)
* attempt to fix 22.04 CI * adding inline comment reminder
1 parent 19e3f46 commit 80bb5bf

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ _commands:
3333
- restore_cache:
3434
name: Restore Cache << parameters.key >>
3535
keys:
36-
- "<< parameters.key >>-v20\
36+
- "<< parameters.key >>-v21\
3737
-{{ arch }}\
3838
-{{ .Branch }}\
3939
-{{ .Environment.CIRCLE_PR_NUMBER }}\
4040
-{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}"
41-
- "<< parameters.key >>-v20\
41+
- "<< parameters.key >>-v21\
4242
-{{ arch }}\
4343
-main\
4444
-<no value>\
@@ -58,7 +58,7 @@ _commands:
5858
steps:
5959
- save_cache:
6060
name: Save Cache << parameters.key >>
61-
key: "<< parameters.key >>-v20\
61+
key: "<< parameters.key >>-v21\
6262
-{{ arch }}\
6363
-{{ .Branch }}\
6464
-{{ .Environment.CIRCLE_PR_NUMBER }}\
@@ -96,6 +96,11 @@ _commands:
9696
(echo vcs_export && cat) >> lockfile.txt
9797
sha256sum $PWD/lockfile.txt >> lockfile.txt
9898
99+
# Temp: Rolling transition to 24.04 leaves rosdep in 22.04 in the lurch
100+
# This replaces main rosdep index with the last prior to release: Feb 28, 2024
101+
sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-02-28|" /etc/ros/rosdep/sources.list.d/20-default.list
102+
export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml
103+
99104
apt-get update
100105
rosdep update --rosdistro $ROS_DISTRO
101106
dependencies=$(

0 commit comments

Comments
 (0)