Skip to content

Commit

Permalink
Merge branch 'main' into ch3/trajectory_cache
Browse files Browse the repository at this point in the history
  • Loading branch information
sjahr authored Jul 19, 2024
2 parents 93540ee + a7fe0df commit 408a2fd
Show file tree
Hide file tree
Showing 130 changed files with 1,037 additions and 231 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
Checks: '-*,
performance-*,
-performance-enum-size,
llvm-namespace-comment,
modernize-redundant-void-arg,
modernize-use-nullptr,
Expand All @@ -21,7 +22,6 @@ Checks: '-*,
readability-static-definition-in-anonymous-namespace,
'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
CheckOptions:
- key: llvm-namespace-comment.ShortNamespaceLines
value: '10'
Expand Down
29 changes: 18 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,18 @@ jobs:
matrix:
env:
- IMAGE: rolling-ci
CCOV: true
CCOV: false # Disabled: https://github.com/moveit/moveit2/issues/2866
ROS_DISTRO: rolling
- IMAGE: rolling-ci-testing
- IMAGE: rolling-ci
ROS_DISTRO: rolling
IKFAST_TEST: true
CLANG_TIDY: pedantic
- IMAGE: humble-ci
ROS_DISTRO: humble
- IMAGE: humble-ci-testing
ROS_DISTRO: humble
- IMAGE: jazzy-ci
ROS_DISTRO: jazzy
env:
CXXFLAGS: >-
-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls
Expand All @@ -50,7 +52,7 @@ jobs:
-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld
-DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld
-DCMAKE_BUILD_TYPE=${{ matrix.env.CCOV && 'Debug' || 'Release'}}
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS${{ matrix.env.CCOV && ' --coverage -O2 -fno-omit-frame-pointer'}}"
-DCMAKE_CXX_FLAGS="-Werror $CXXFLAGS${{ matrix.env.CCOV && ' --coverage -O2 -fno-omit-frame-pointer' || ''}}"
UPSTREAM_CMAKE_ARGS: "-DCMAKE_CXX_FLAGS=''"
DOWNSTREAM_CMAKE_ARGS: -DCMAKE_CXX_FLAGS="-Wall -Wextra"
CCACHE_DIR: ${{ github.workspace }}/.ccache
Expand All @@ -61,6 +63,7 @@ jobs:
(cd $TARGET_REPO_PATH; clang-tidy --list-checks)
# Disable clang-tidy for ikfast plugins as we cannot fix the generated code
find $BASEDIR/target_ws/build -iwholename "*_ikfast_plugin/compile_commands.json" -exec rm {} \;
find $BASEDIR/target_ws/build -iwholename "*_ikfast_manipulator_plugin/compile_commands.json" -exec rm {} \;
CC: ${{ matrix.env.CLANG_TIDY && 'clang' }}
CXX: ${{ matrix.env.CLANG_TIDY && 'clang++' }}
ADDITIONAL_DEBS: lld
Expand All @@ -83,10 +86,12 @@ jobs:
sudo rm -rf /usr/local
df -h
- uses: actions/checkout@v4
- uses: testspace-com/setup-testspace@v1
if: github.repository == 'moveit/moveit2'
with:
domain: ros-planning
# NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org
# See: https://github.com/moveit/moveit2/issues/2852
# - uses: testspace-com/setup-testspace@v1
# if: github.repository == 'moveit/moveit2'
# with:
# domain: moveit
- name: Get latest release date for rosdistro
id: rosdistro_release_date
uses: JafarAbdi/latest-rosdistro-release-date-action@main
Expand Down Expand Up @@ -140,10 +145,12 @@ jobs:
name: Run industrial_ci
uses: ros-industrial/industrial_ci@master
env: ${{ matrix.env }}
- name: Push result to Testspace
if: always() && (github.repository == 'moveit/moveit2')
run: |
testspace "[ ${{ matrix.env.IMAGE }} ]${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml"
# NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org
# See: https://github.com/moveit/moveit2/issues/2852
# - name: Push result to Testspace
# if: always() && (github.repository == 'moveit/moveit2')
# run: |
# testspace "[ ${{ matrix.env.IMAGE }} ]${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml"
- name: Upload test artifacts (on failure)
uses: actions/upload-artifact@v4
if: failure() && (steps.ici.outputs.run_target_test || steps.ici.outputs.target_test_results)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [rolling, jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
file: .docker/${{ github.job }}/Dockerfile
build-args: ROS_DISTRO=${{ matrix.ROS_DISTRO }}
Expand All @@ -72,7 +72,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [rolling, jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and Push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
file: .docker/${{ github.job }}/Dockerfile
build-args: ROS_DISTRO=${{ matrix.ROS_DISTRO }}
Expand All @@ -128,7 +128,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [rolling, jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
- name: "Remove .dockerignore"
run: rm .dockerignore # enforce full source context
- name: Build and Push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: .docker/${{ github.job }}/Dockerfile
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,11 @@ jobs:
sudo rm -rf /usr/local
df -h
- uses: actions/checkout@v4
- uses: testspace-com/setup-testspace@v1
if: github.repository == 'moveit/moveit2'
with:
domain: ros-planning
# Testspace disabled temporarily: https://github.com/moveit/moveit2/issues/2852
# - uses: testspace-com/setup-testspace@v1
# if: github.repository == 'moveit/moveit2'
# with:
# domain: ros-planning
- name: Get latest release date for rosdistro
id: rosdistro_release_date
uses: JafarAbdi/latest-rosdistro-release-date-action@main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tutorial_docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ jobs:
path: .ccache
key: docker-tutorial-ccache-${{ matrix.ROS_DISTRO }}-${{ hashFiles( '.docker/tutorial-source/Dockerfile' ) }}
- name: inject ccache into docker
uses: reproducible-containers/[email protected].0
uses: reproducible-containers/[email protected].2
with:
cache-source: .ccache
cache-target: /root/.ccache/
- name: Build and Push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: .docker/${{ github.job }}/Dockerfile
Expand Down
Loading

0 comments on commit 408a2fd

Please sign in to comment.