Skip to content

Commit

Permalink
Change ament_cobra version to main temporarily. Waiting for proper re…
Browse files Browse the repository at this point in the history
…lease tag 0.12.0. space-ros#157
  • Loading branch information
asimonov committed Oct 29, 2024
1 parent a1fae6e commit b54239f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
22 changes: 3 additions & 19 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ spaceros-artifacts:
# we run vcstool inside this task, because some packages in `ros2.repos` are not pinned and otherwise
# earthly won't pull latest changes
RUN mkdir src
# TODO restore shallow after cobra_vendor merge
RUN vcs import --retry 3 --input ros2.repos src
RUN vcs import --shallow --retry 3 --input ros2.repos src
RUN vcs export --exact src > exact.repos

SAVE ARTIFACT ros2.repos
Expand All @@ -157,8 +156,7 @@ sources:
COPY +spaceros-artifacts/excluded-pkgs.txt excluded-pkgs.txt
COPY +spaceros-artifacts/exact.repos exact.repos
RUN mkdir src
# TODO restore shallow after cobra_vendor merge
RUN vcs import --retry 3 --input exact.repos src
RUN vcs import --shallow --retry 3 --input exact.repos src
SAVE ARTIFACT src AS LOCAL src

vcs-exact:
Expand Down Expand Up @@ -230,13 +228,6 @@ rosdep:
build:
FROM +rosdep

# WORKAROUND START
# * PR to update Cobra version to 4.8 in ament_cobra: https://github.com/ament/ament_cobra/pull/21
RUN cd /opt/spaceros/src/ament_cobra && echo "ok" && \
git fetch origin pull/21/head:pr21_cobra_version && \
git checkout pr21_cobra_version
# WORKAROUND END

RUN colcon build \
--cmake-args \
-DCMAKE_BUILD_TYPE=Release \
Expand All @@ -250,13 +241,6 @@ build-dev:
FROM +rosdep
ARG tag='jazzy'

# WORKAROUND START
# * PR to update Cobra version to 4.8 in ament_cobra: https://github.com/ament/ament_cobra/pull/21
RUN cd /opt/spaceros/src/ament_cobra && echo "ok" && \
git fetch origin pull/21/head:pr21_cobra_version && \
git checkout pr21_cobra_version
# WORKAROUND END

RUN colcon build \
--cmake-args \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
Expand All @@ -268,7 +252,7 @@ build-dev:

build-testing:
FROM +build-dev
# exclude ament_lint tests as they give error on Jazzy
# exclude ament_lint tests as they give error on Jazzy due to python 'unittest' requiring at least one test recently
RUN . install/setup.sh && \
colcon test \
--retest-until-pass 2 \
Expand Down
2 changes: 1 addition & 1 deletion ros2.repos
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories:
ament_cobra:
type: git
url: https://github.com/ament/ament_cobra.git
version: master
version: main
ament_ikos:
type: git
url: https://github.com/ament/ament_ikos.git
Expand Down
2 changes: 1 addition & 1 deletion spaceros.repos
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repositories:
ament_cobra:
type: git
url: https://github.com/ament/ament_cobra.git
version: master
version: main
ament_ikos:
type: git
url: https://github.com/ament/ament_ikos.git
Expand Down

0 comments on commit b54239f

Please sign in to comment.