Skip to content

Commit 19eafe3

Browse files
committed
Merge branch 'master' into track-target-switch
2 parents ba03e54 + 5507d70 commit 19eafe3

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

.github/workflows/format.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is a format job. Pre-commit has a first-party GitHub action, so we use
22
# that: https://github.com/pre-commit/action
33

4-
name: Format
4+
name: format
55

66
on:
77
workflow_dispatch:
@@ -11,24 +11,12 @@ on:
1111
jobs:
1212
pre-commit:
1313
name: pre-commit
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v2
17-
- uses: actions/setup-python@v2
18-
- name: Install clang-format-10
16+
- uses: actions/checkout@v3
17+
- uses: actions/setup-python@v3
18+
- name: Install clang-format
1919
run: |
20-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
21-
sudo apt-get install clang-format-10
22-
- name: Install catkin-lint
23-
run: |
24-
lsb_release -sc
25-
sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
26-
sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
27-
sudo apt-get -q update
28-
sudo apt-get -q install python3-rosdep
29-
rm -f /etc/ros/rosdep/sources.list.d/*.list
30-
sudo rosdep init
31-
rosdep update
32-
sudo apt-get -q install catkin-lint
33-
export ROS_DISTRO=noetic
34-
- uses: pre-commit/action@v2.0.0
20+
sudo apt update
21+
sudo apt install clang-format
22+
- uses: pre-commit/action@v3.0.0

.pre-commit-config.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ repos:
4343
- id: clang-format
4444
name: clang-format
4545
description: Format files with ClangFormat.
46-
entry: clang-format-10
46+
entry: clang-format
4747
language: system
4848
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
4949
args: [ "-fallback-style=none", "-i" ]
50-
- id: catkin_lint
51-
name: catkin_lint
52-
description: Check package.xml and cmake files
53-
entry: catkin_lint .
54-
language: system
55-
always_run: true
56-
pass_filenames: false

0 commit comments

Comments
 (0)