Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CI #268

Merged
merged 3 commits into from
Dec 4, 2022
Merged

update CI #268

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ddb7eb
fix whitespace
christianrauch Dec 4, 2022
1d60beb
update ros-tooling/setup-ros action
christianrauch Dec 4, 2022
211634c
remove ROS1 and Python wrapper from macOS CI
christianrauch Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 7 additions & 29 deletions .github/workflows/ros_workspace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
ros_distribution: [melodic, noetic, humble]
config: ["default"] # nice name
cmake_args: ['[ ]'] # empty list of options
include:
include:
- docker_image: ubuntu:18.04
ros_distribution: melodic
ros_version: 1
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# submodules: recursive

- name: Setup ROS environment
uses: ros-tooling/setup-ros@v0.3
uses: ros-tooling/setup-ros@v0.4

- name: ROS 1 CI Action
if: ${{ matrix.ros_version == 1 }}
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
submodules: recursive

- name: Setup ROS environment
uses: ros-tooling/setup-ros@v0.3
uses: ros-tooling/setup-ros@v0.4

- name: ROS 1 CI Action
if: ${{ matrix.ros_version == 1 }}
Expand Down Expand Up @@ -123,53 +123,31 @@ jobs:

# build on macOS native
build_macos:
name: macOS (${{ matrix.ros_distribution }}, ${{ matrix.config }})
name: macOS (${{ matrix.ros_distribution }})

runs-on: macos-latest

strategy:
fail-fast: false
matrix:
ros_distribution: [noetic, humble]
config: ["default"] # nice name
cmake_args: ['[ ]'] # empty list of options
include:
- ros_distribution: noetic
ros_version: 1

- ros_distribution: humble
ros_version: 2

# build static library, this will set BUILD_PYTHON_WRAPPER to OFF
- ros_distribution: humble
ros_version: 2
config: "static"
cmake_args: '[ "-DBUILD_SHARED_LIBS=OFF" ]'
ros_distribution: [humble]

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup ROS environment
uses: ros-tooling/setup-ros@v0.3

- name: ROS 1 CI Action
if: ${{ matrix.ros_version == 1 }}
uses: ros-tooling/action-ros-ci@v0.2
with:
package-name: apriltag
target-ros1-distro: ${{ matrix.ros_distribution }}
uses: ros-tooling/setup-ros@v0.4

- name: ROS 2 CI Action
if: ${{ matrix.ros_version == 2 }}
uses: ros-tooling/action-ros-ci@v0.2
with:
package-name: apriltag
target-ros2-distro: ${{ matrix.ros_distribution }}
colcon-defaults: |
{
"build": {
"cmake-args": ${{ matrix.cmake_args }}
"cmake-args": [ "-DBUILD_PYTHON_WRAPPER=OFF" ]
}
}