From 4ce190f9024c915fad03142663d8b029888ea2a8 Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 29 Apr 2021 10:13:08 -0600 Subject: [PATCH] Update CI (#436) --- .github/{config.yml => config.yaml} | 0 ...rial_ci_action.yml => build_and_test.yaml} | 19 +++++++++---------- .github/workflows/{format.yml => format.yaml} | 2 +- .pre-commit-config.yaml | 5 +++++ README.md | 5 ++++- 5 files changed, 19 insertions(+), 12 deletions(-) rename .github/{config.yml => config.yaml} (100%) rename .github/workflows/{industrial_ci_action.yml => build_and_test.yaml} (84%) rename .github/workflows/{format.yml => format.yaml} (93%) diff --git a/.github/config.yml b/.github/config.yaml similarity index 100% rename from .github/config.yml rename to .github/config.yaml diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/build_and_test.yaml similarity index 84% rename from .github/workflows/industrial_ci_action.yml rename to .github/workflows/build_and_test.yaml index 8fade6a979..c274eadedb 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/build_and_test.yaml @@ -1,7 +1,7 @@ # This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git). # For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst) -name: BuildAndTest +name: Build and Test (Foxy) on: workflow_dispatch: @@ -16,26 +16,26 @@ jobs: strategy: matrix: env: - - IMAGE: 'foxy-ci' + - IMAGE: foxy-ci CCOV: true - - IMAGE: 'foxy-ci-testing' + - IMAGE: foxy-ci-testing IKFAST_TEST: true CLANG_TIDY: true env: DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} UPSTREAM_WORKSPACE: moveit2.repos - AFTER_SETUP_UPSTREAM_WORKSPACE: 'vcs pull $BASEDIR/upstream_ws/src' + AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src BEFORE_TARGET_TEST_EMBED: ${{ matrix.env.IKFAST_TEST && 'set +u && source moveit_kinematics/test/test_ikfast_plugins.sh && set -u' || '' }} AFTER_RUN_TARGET_TEST: ${{ matrix.env.CCOV && './.ci.prepare_codecov' || '' }} TARGET_CMAKE_ARGS: > -DCMAKE_BUILD_TYPE=${{ matrix.env.CCOV && 'RelWithDebInfo' || 'Release'}} ${{ matrix.env.CCOV && '-DCMAKE_CXX_FLAGS="--coverage" --no-warn-unused-cli' || '' }} - CCACHE_DIR: "${{ github.workspace }}/.ccache" + CCACHE_DIR: ${{ github.workspace }}/.ccache BASEDIR: ${{ github.workspace }}/.work - CACHE_PREFIX: "${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && '-ccov' || '' }}" - CLANG_TIDY_BASE_REF: "${{ github.base_ref || github.ref }}" + CACHE_PREFIX: ${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && '-ccov' || '' }} + CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }} - name: "${{ matrix.env.IMAGE }}${{ contains(matrix.env.IKFAST_TEST, 'ikfast') && ' + ikfast' || ''}}${{ matrix.env.CCOV && ' + ccov' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}" + name: ${{ matrix.env.IMAGE }}${{ contains(matrix.env.IKFAST_TEST, 'ikfast') && ' + ikfast' || ''}}${{ matrix.env.CCOV && ' + ccov' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }} runs-on: ubuntu-latest steps: - name: "Free up disk space" @@ -78,9 +78,8 @@ jobs: restore-keys: | ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }} ccache-${{ env.CACHE_PREFIX }} - # https://github.com/ros-industrial/industrial_ci/pull/649 - name: industrial_ci - uses: 'tylerjw/industrial_ci@clang-tidy-modified-filter' + uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }} - name: upload test artifacts (on failure) uses: actions/upload-artifact@v2 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yaml similarity index 93% rename from .github/workflows/format.yml rename to .github/workflows/format.yaml index ef10e812d9..f3c976d5e5 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yaml @@ -1,7 +1,7 @@ # This is a format job. Pre-commit has a first-party GitHub action, so we use # that: https://github.com/pre-commit/action -name: Format +name: Formatting (pre-commit) on: workflow_dispatch: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b380f58c88..866be4ee1c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,12 +19,17 @@ repos: hooks: - id: check-added-large-files - id: check-case-conflict + - id: check-json - id: check-merge-conflict - id: check-symlinks + - id: check-toml - id: check-yaml - id: debug-statements + - id: destroyed-symlinks + - id: detect-private-key - id: end-of-file-fixer - id: mixed-line-ending + - id: pretty-format-json - id: trailing-whitespace - repo: https://github.com/psf/black diff --git a/README.md b/README.md index cfee479c53..1b0fb65688 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,10 @@ The MoveIt Motion Planning Framework for **ROS 2**. For ROS 1, see [MoveIt 1](ht ## Continuous Integration Status -[![Format](https://github.com/ros-planning/moveit2/actions/workflows/format.yml/badge.svg?branch=main)](https://github.com/ros-planning/moveit2/actions/workflows/format.yml?branch=main) [![BuildAndTest](https://github.com/ros-planning/moveit2/actions/workflows/industrial_ci_action.yml/badge.svg?branch=main)](https://github.com/ros-planning/moveit2/actions/workflows/industrial_ci_action.yml?branch=main) [![codecov](https://codecov.io/gh/ros-planning/moveit2/branch/main/graph/badge.svg?token=W7uHKcY0ly)](https://codecov.io/gh/ros-planning/moveit2) + +[![Formatting (pre-commit)](https://github.com/ros-planning/moveit2/actions/workflows/format.yaml/badge.svg?branch=main)](https://github.com/ros-planning/moveit2/actions/workflows/format.yaml?query=branch%3Amain) +[![Build and Test (Foxy)](https://github.com/ros-planning/moveit2/actions/workflows/build_and_test.yaml/badge.svg?branch=main)](https://github.com/ros-planning/moveit2/actions/workflows/build_and_test.yaml?query=branch%3Amain) +[![Code Coverage](https://codecov.io/gh/ros-planning/moveit2/branch/main/graph/badge.svg?token=W7uHKcY0ly)](https://codecov.io/gh/ros-planning/moveit2) ## General MoveIt Documentation