Skip to content

Commit bd8de6d

Browse files
committed
ci: minor cosmetics changes
1 parent f7bfd00 commit bd8de6d

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.github/workflows/ci-arch.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: CI - ArchLinux
22

33
on:
44
push:
5-
branches: devel
5+
branches:
6+
- devel
67
pull_request:
78
paths-ignore:
89
- CHANGELOG.md
@@ -13,7 +14,7 @@ concurrency:
1314

1415
jobs:
1516
build-with-arch:
16-
runs-on: "ubuntu-latest"
17+
runs-on: ubuntu-latest
1718
container:
1819
image: archlinux/archlinux:base-devel
1920
steps:

.github/workflows/ci-linux-osx-win-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Activate ccache [Conda]
8585
uses: hendrikmuhs/ccache-action@v1.2
8686
with:
87-
key: ${{ matrix.os }}-${{ matrix.type }}-${{ matrix.cxx_std }}
87+
key: ${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_std }}
8888
max-size: 1G
8989

9090
- name: Print environment [Conda]

.github/workflows/ci-linux-ros.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: CI - Linux - ROS
22
on:
33
push:
4-
branches: devel
4+
branches:
5+
- devel
56
pull_request:
67
paths-ignore:
78
- CHANGELOG.md
@@ -16,30 +17,31 @@ jobs:
1617
matrix:
1718
env:
1819
# ROS2 Jazzy Jalisco (May 2024 - May 2029)
19-
- {name: "Jazzy / Debug", ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: OFF}
20-
- {name: "Jazzy / Release", ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: OFF}
21-
- {name: "Jazzy / Debug / Vectorization", ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
22-
- {name: "Jazzy / Release / Vectorization", ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
20+
- {ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: OFF}
21+
- {ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: OFF}
22+
- {ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
23+
- {ROS_DISTRO: jazzy, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
2324
# ROS2 Humble Hawksbill (May 2022 - May 2027)
24-
- {name: "Humble / Debug / Vectorization", ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
25-
- {name: "Humble / Release / Vectorization", ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
25+
- {ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
26+
- {ROS_DISTRO: humble, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
2627
# - {name: "Humble / Pre-Release", ROS_DISTRO: humble, PRERELEASE: true}
2728
# ROS2 Rolling Ridley
28-
- {name: "Rolling / Debug / Vectorization", ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
29-
- {name: "Rolling / Release / Vectorization", ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
29+
- {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Debug, VECTORIZATION_SUPPORT: ON}
30+
- {ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON}
3031
# - {name: "Rolling / Pre-Release", ROS_DISTRO: rolling, PRERELEASE: true}
3132
# - {name: "Rolling / TSID-Downstream", ROS_DISTRO: rolling, CMAKE_BUILD_TYPE: Release, VECTORIZATION_SUPPORT: ON, DOWNSTREAM_WORKSPACE: "github:stack-of-tasks/tsid#devel github:stack-of-tasks/eiquadprog#devel", DOWNSTREAM_CMAKE_ARGS: -DBUILD_WITH_PROXQP=ON}
32-
name: ${{ matrix.env.name }}
33+
name: ROS ${{ matrix.env.ROS_DISTRO }} - ${{ matrix.env.CMAKE_BUILD_TYPE }} ${{ matrix.env.VECTORIZATION_SUPPORT == 'ON' && '- Vectorization' || '' }}
3334
env:
3435
CMAKE_ARGS: -DBUILD_WITH_VECTORIZATION_SUPPORT=${{ matrix.env.VECTORIZATION_SUPPORT }} # Simde is available since humble
3536
VERBOSE_OUTPUT: true
3637
VERBOSE_TESTS: true
38+
ROS_DISTRO: ${{ matrix.env.ROS_DISTRO }}
39+
CMAKE_BUILD_TYPE: ${{ matrix.env.CMAKE_BUILD_TYPE }}
3740
runs-on: ubuntu-latest
3841
steps:
3942
- uses: actions/checkout@v6
4043
# Run industrial_ci
4144
- uses: 'ros-industrial/industrial_ci@master'
42-
env: ${{ matrix.env }}
4345

4446

4547
check:

0 commit comments

Comments
 (0)