Skip to content

Commit

Permalink
fix rmf ci (open-rmf#151)
Browse files Browse the repository at this point in the history
Signed-off-by: youliang <[email protected]>
  • Loading branch information
youliangtan authored May 4, 2022
1 parent b39bbdb commit 1573878
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ jobs:
- name: deps
uses: ros-tooling/[email protected]
with:
required-ros-distributions: foxy
required-ros-distributions: galactic
- uses: actions/checkout@v2
- name: build_and_test
uses: ros-tooling/[email protected]
env:
QT_QPA_PLATFORM: offscreen
with:
target-ros2-distro: foxy
target-ros2-distro: galactic
# build all packages listed in the meta package
package-name: |
rmf_utils
Expand Down Expand Up @@ -54,7 +55,7 @@ jobs:
rmf_demos_panel
rmf_demos_tasks
vcs-repo-file-url: |
https://raw.githubusercontent.com/open-rmf/rmf/main/rmf.repos
rmf.repos
colcon-defaults: |
{
"build": {
Expand All @@ -74,4 +75,3 @@ jobs:
files: ros_ws/lcov/total_coverage.info
flags: tests
name: lean_and_mean_codecov_bot

3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Stage 1 - Dependencies
#-----------------------

FROM ros:foxy AS builder
FROM ros:galactic AS builder

RUN apt-get update \
&& apt-get install -y \
Expand Down Expand Up @@ -30,6 +30,7 @@ RUN mkdir src
RUN rosdep update --rosdistro $ROS_DISTRO

# This replaces: wget https://raw.githubusercontent.com/open-rmf/rmf/main/rmf.repos
ENV DEBIAN_FRONTEND=noninteractive
COPY rmf.repos rmf.repos
RUN vcs import src < rmf.repos \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion rmf.repos
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ repositories:
thirdparty/ros_ign:
type: git
url: https://github.com/ignitionrobotics/ros_ign.git
version: ros2
version: galactic

0 comments on commit 1573878

Please sign in to comment.