Skip to content

Commit b40fe20

Browse files
authored
ci: update ros 2 dockerfile and gh actions (#130)
1 parent 75a63b8 commit b40fe20

File tree

7 files changed

+34
-27
lines changed

7 files changed

+34
-27
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/pr-checks.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ on:
44
types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
55
branches:
66
- main
7-
- master
87

98
jobs:
109
build:
1110
name: Check Actions
1211
runs-on: ubuntu-latest
1312
steps:
14-
- uses: actions/checkout@v1
13+
- uses: actions/checkout@v4
1514
- name: Changelog check
16-
uses: Zomzog/changelog-checker@v1.1.0
15+
uses: Zomzog/changelog-checker@09cfe9ad3618dcbfdba261adce0c41904cabb8c4 # v1.3.0
1716
with:
1817
fileName: CHANGELOG.rst
1918
env:

.github/workflows/release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
name: publish release
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- name: Set up Python 3.8
15-
uses: actions/setup-python@v4
13+
- uses: actions/checkout@v4
14+
- name: Set up Python 3.12
15+
uses: actions/setup-python@v5
1616
with:
17-
python-version: 3.8
17+
python-version: 3.12
1818
- name: 🔗 Install dependencies
1919
run: |
2020
python -m pip install --upgrade pip
@@ -23,11 +23,9 @@ jobs:
2323
run: |
2424
python -m pip install --no-cache-dir -r requirements-dev.txt
2525
- name: 💃 Build release
26-
if: success() && startsWith(github.ref, 'refs/tags')
2726
run: |
2827
python setup.py clean --all sdist bdist_wheel
2928
- name: 📦 Publish release to PyPI
30-
if: success() && startsWith(github.ref, 'refs/tags')
31-
uses: pypa/gh-action-pypi-publish@release/v1
29+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
3230
with:
3331
password: ${{ secrets.pypi_password }}

.github/workflows/build-ros1.yml renamed to .github/workflows/test-ros1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: Test against ROS 1
22

33
on:
44
push:
@@ -11,7 +11,7 @@ on:
1111
- main
1212

1313
jobs:
14-
build-ros1:
14+
test-ros1:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:

.github/workflows/build-ros2.yml renamed to .github/workflows/test-ros2.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: Test package against ROS 2
22

33
on:
44
push:
@@ -11,14 +11,15 @@ on:
1111
- main
1212

1313
jobs:
14-
build-ros2:
14+
test-ros2:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
1818
name: [
1919
"ubuntu-py39",
2020
"ubuntu-py310",
2121
"ubuntu-py311",
22+
"ubuntu-py312",
2223
]
2324
include:
2425
- name: "ubuntu-py39"
@@ -30,10 +31,13 @@ jobs:
3031
- name: "ubuntu-py311"
3132
os: ubuntu-latest
3233
python-version: "3.11"
34+
- name: "ubuntu-py312"
35+
os: ubuntu-latest
36+
python-version: "3.12"
3337
steps:
34-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3539
- name: Set up Python ${{ matrix.python-version }}
36-
uses: actions/setup-python@v4
40+
uses: actions/setup-python@v5
3741
with:
3842
python-version: ${{ matrix.python-version }}
3943
- name: Install dependencies

docker/ros1/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM ros:noetic
2-
LABEL maintainer "Gonzalo Casas <[email protected]>"
2+
LABEL maintainer="Gonzalo Casas <[email protected]>"
33

44
SHELL ["/bin/bash","-c"]
55

66
# Install rosbridge
77
RUN apt-get update && apt-get install -y \
8-
ros-noetic-rosbridge-suite \
9-
ros-noetic-tf2-web-republisher \
10-
ros-noetic-ros-tutorials \
11-
ros-noetic-actionlib-tutorials \
8+
ros-${ROS_DISTRO}-rosbridge-suite \
9+
ros-${ROS_DISTRO}-tf2-web-republisher \
10+
ros-${ROS_DISTRO}-ros-tutorials \
11+
ros-${ROS_DISTRO}-actionlib-tutorials \
1212
--no-install-recommends \
1313
# Clear apt-cache to reduce image size
1414
&& rm -rf /var/lib/apt/lists/*

docker/ros2/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM ros:iron
2-
LABEL maintainer "Gonzalo Casas <[email protected]>"
1+
FROM ros:jazzy
2+
LABEL maintainer="Gonzalo Casas <[email protected]>"
33

44
SHELL ["/bin/bash","-c"]
55

66
# Install rosbridge
77
RUN apt-get update && apt-get install -y \
8-
ros-iron-rosbridge-suite \
9-
# ros-iron-tf2-web-republisher \
10-
# ros-iron-ros-tutorials \
11-
# ros-iron-actionlib-tutorials \
8+
ros-${ROS_DISTRO}-rosbridge-suite \
9+
# ros-${ROS_DISTRO}-tf2-web-republisher \
10+
# ros-${ROS_DISTRO}-ros-tutorials \
11+
# ros-${ROS_DISTRO}-actionlib-tutorials \
1212
--no-install-recommends \
1313
# Clear apt-cache to reduce image size
1414
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)