Skip to content

Commit

Permalink
CI Update (#113)
Browse files Browse the repository at this point in the history
* Updated Ubuntu and Windows jobs

* Updated README

* Updated lint jobs
  • Loading branch information
marip8 authored Jul 19, 2024
1 parent 4321bc9 commit e1b1c1c
Show file tree
Hide file tree
Showing 9 changed files with 113 additions and 160 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
clang_format:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/cmake_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ on:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
cmake_lang:
name: Format
name: CMake-Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Ubuntu [Focal, Jammy, Noble]

on:
push:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
ci:
name: ${{ matrix.distro }}
runs-on: ubuntu-latest
container:
image: ubuntu:${{ matrix.distro }}
env:
DEBIAN_FRONTEND: noninteractive
strategy:
fail-fast: false
matrix:
distro: [focal, jammy, noble]
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
path: target_ws/src

- name: Install dependencies
run: |
apt update -q
apt install -q -y clang-tidy
- name: Build and test
uses: tesseract-robotics/colcon-action@v9
with:
ccache-enabled: false
add-ros-ppa: true
rosdep-enabled: true
vcs-file: dependencies.repos
target-path: target_ws/src
target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DDESCARTES_ENABLE_TESTING=ON -DDESCARTES_ENABLE_CLANG_TIDY=ON
run-tests: true
43 changes: 0 additions & 43 deletions .github/workflows/ubuntu_bionic.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/ubuntu_focal.yml

This file was deleted.

63 changes: 63 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Windows [2019, 2022]

on:
push:
branches:
- master
pull_request:
schedule:
- cron: '0 5 * * *'

jobs:
ci:
name: ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-2019, windows-2022]

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
path: target_ws/src

- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.28.x'

- name: vcpkg build
uses: johnwason/vcpkg-action@v6
with:
pkgs: console-bridge eigen3 boost-graph gtest
triplet: x64-windows-release
extra-args: --clean-after-build
token: ${{ github.token }}
cache-key: ci-${{ matrix.os }}
github-binarycache: true
revision: 2024.01.12

- name: configure-msvc
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64

- name: update environment
shell: bash
run: |
echo "PATH=${{ env.PATH }};$GITHUB_WORKSPACE\vcpkg\installed\x64-windows-release\bin" >> "$GITHUB_ENV"
echo "CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE\vcpkg\installed\x64-windows-release" >> "$GITHUB_ENV"
- name: Build and Tests
uses: tesseract-robotics/colcon-action@v9
with:
ccache-prefix: ${{ matrix.os }}
rosdep-enabled: false
add-ros-ppa: false
vcs-file: dependencies.repos
upstream-args: --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release
target-path: target_ws/src
target-args: --cmake-args -G "Ninja" -DVCPKG_TARGET_TRIPLET=x64-windows-release -DCMAKE_BUILD_TYPE=Release -DDESCARTES_ENABLE_TESTING=ON
run-tests: true
60 changes: 0 additions & 60 deletions .github/workflows/windows_2019.yml

This file was deleted.

14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ This package is intented to be a simple ladder graph building library. The core

## Build Status

Platform | CI Status
---------------------|:---------
Linux (Bionic) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu_bionic.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu_bionic.yml)
Linux (Focal) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu_focal.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu_focal.yml)
Windows | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/windows_2019.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/windows_2019.yml)
Lint (Clang-Format) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/clang_format.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/clang_format.yml)
Lint (CMake-Format) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/cmake_format.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/cmake_format.yml)

Platform | CI Status
-----------------------------|:---------
Ubuntu (Focal, Jammy, Noble) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/ubuntu.yml)
Windows (2019, 2022) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/windows.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/windows.yml)
Lint (Clang-Format) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/clang_format.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/clang_format.yml)
Lint (CMake-Format) | [![Build Status](https://github.com/swri-robotics/descartes_light/actions/workflows/cmake_format.yml/badge.svg)](https://github.com/swri-robotics/descartes_light/actions/workflows/cmake_format.yml)
File renamed without changes.

0 comments on commit e1b1c1c

Please sign in to comment.