Skip to content

Commit

Permalink
CI update: Jammy ROS One, clang-format-12
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Nov 4, 2023
1 parent e03e7c8 commit 13d6d6f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# rhaschke/ici:rviz-noetic-ros
# Image used for GHA CI builds
# build with: DOCKER_BUILDKIT=1 docker build --tag rhaschke/ici:rviz-noetic-ros - < .github/workflows/Dockerfile
# build with:
# - DOCKER_BUILDKIT=1 docker build --tag rhaschke/ici:rviz-noetic-ros - < .github/workflows/Dockerfile
# - DOCKER_BUILDKIT=1 docker build --tag rhaschke/ici:rviz-jammy-ros --build-arg="BASE=ubiagni/ros:jammy-ros-base" --build-arg="ROS_DISTRO=one" - < .github/workflows/Dockerfile

ARG ROS_DISTRO=noetic
FROM ros:${ROS_DISTRO}-ros-base
ARG BASE=ros:noetic-ros-base
FROM ${BASE}

ENV TERM xterm

Expand All @@ -19,11 +22,9 @@ RUN --mount=type=bind,target=/tmp/rviz \
# Some basic requirements
wget git sudo \
# Preferred build tools
python$(test "${ROS_DISTRO}" = "noetic" && echo 3)-catkin-tools \
clang clang-format-10 clang-tidy clang-tools \
ccache && \
clang clang-format-12 clang-tidy clang-tools ccache && \
#
# Download all dependencies of MoveIt
# Download all dependencies for rviz
rosdep update $(test "${ROS_DISTRO}" = "melodic" && echo "--include-eol-distros") && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths /tmp/rviz --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [noetic]
distro: [noetic, jammy]
ogre: ["1.9", "1.12"]
include:
- distro: noetic
Expand All @@ -28,7 +28,7 @@ jobs:
CATKIN_LINT: true
CCACHE_DIR: ${{ github.workspace }}/.ccache
BASEDIR: /home/runner/work
DOCKER_IMAGE: rhaschke/ici:rviz-${{ matrix.distro }}-${{ matrix.repo || 'ros' }}
DOCKER_IMAGE: rhaschke/ici:rviz-${{ matrix.distro }}-ros
CACHE_PREFIX: ${{ matrix.distro }}
# perform full clang-tidy check only on manual trigger (workflow_dispatch), PRs do check changed files, otherwise nothing
CLANG_TIDY_BASE_REF: ${{ github.event_name != 'workflow_dispatch' && (github.base_ref || github.ref) || '' }}
Expand All @@ -51,7 +51,6 @@ jobs:

- name: industrial_ci
uses: rhaschke/industrial_ci@master
env: ${{ matrix.env || env }}

- name: Upload test artifacts (on failure)
uses: actions/upload-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install clang-format-10
run: sudo apt-get install clang-format-10
- name: Install clang-format-12
run: sudo apt-get install clang-format-12
- uses: rhaschke/install-catkin_lint-action@v1.0
with:
distro: noetic
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ repos:
- id: clang-format
name: clang-format
description: Format files with ClangFormat.
entry: clang-format-10
entry: clang-format-12
language: system
files: \.(c|cc|cxx|cpp|h|hpp|hxx|ih|ispc|ipp)$
args: ["-fallback-style=none", "-i"]
Expand Down

0 comments on commit 13d6d6f

Please sign in to comment.