Skip to content

Commit 8bbc02f

Browse files
committed
Update CI and Dockerfile
1 parent 10bbc5c commit 8bbc02f

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/linux-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
5555
sudo apt-get -y update
5656
57-
sudo apt-get -y install libtbb-dev libboost-all-dev libsdformat13-dev
57+
sudo apt-get -y install libtbb-dev libboost-all-dev libsdformat15-dev
5858
5959
# Install CppUnitLite.
6060
git clone https://github.com/borglab/CppUnitLite.git

.github/workflows/macos-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
brew install boost
4646
brew tap osrf/simulation
47-
brew install sdformat13
47+
brew install sdformat15
4848
brew tap borglab/core
4949
5050
- name: GTSAM

.github/workflows/python-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
5555
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
5656
sudo apt-get -y update
57-
sudo apt-get -y install libtbb-dev libboost-all-dev libsdformat13-dev
57+
sudo apt-get -y install libtbb-dev libboost-all-dev libsdformat15-dev
5858
5959
- name: Install System Dependencies (macOS)
6060
if: runner.os == 'macOS'
@@ -70,7 +70,7 @@ jobs:
7070
fi
7171
brew install boost
7272
brew tap osrf/simulation
73-
brew install sdformat13
73+
brew install sdformat15
7474
7575
- name: Python Dependencies (Linux)
7676
if: runner.os == 'Linux'

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ WORKDIR /usr/src/
1010
# Make sure we have latest packages
1111
RUN apt-get -y update
1212

13-
# Install basic dependencies for sdfformat
13+
# Install basic dependencies for sdformat
1414
RUN apt-get install -y ruby-dev build-essential libboost-all-dev cmake pkg-config wget lsb-release
1515

1616
# Get Gazebo packages
1717
RUN sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
1818
RUN wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
1919
RUN apt-get update
20-
RUN apt-get install -y libtinyxml2-dev liburdfdom-dev libignition-cmake2-dev libignition-tools-dev libignition-math6-dev python3-psutil
20+
RUN apt-get install -y libtinyxml2-dev liburdfdom-dev libgz-cmake2-dev libgz-tools-dev libgz-math6-dev python3-psutil
2121

2222
# Get sdfformat package
23-
ENV GTD_SDFormat_VERSION="10.5.0"
23+
ENV GTD_SDFormat_VERSION="15.0.0"
2424
RUN wget http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-${GTD_SDFormat_VERSION}.tar.bz2
2525
RUN tar -xvjf sdformat-${GTD_SDFormat_VERSION}.tar.bz2
2626
RUN rm sdformat-${GTD_SDFormat_VERSION}.tar.bz2

0 commit comments

Comments
 (0)