Skip to content

Commit

Permalink
Merge release Isetta (#176)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
This PR is to merge release branch isetta to master for release 4.3.0
## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
[CARMA Contributing
Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
codygarver authored Feb 9, 2023
2 parents 7392910 + e2479a4 commit 68a288d
Show file tree
Hide file tree
Showing 41 changed files with 4,903 additions and 1,316 deletions.
10 changes: 3 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Pull docker image from docker hub
# XTERM used for better catkin_make output
docker:
- image: usdotfhwastol/carma-base:carma-system-4.2.0
- image: usdotfhwastol/carma-base:carma-system-4.3.0
user: carma
environment:
TERM: xterm
Expand All @@ -53,20 +53,16 @@ jobs:
command: |
source ${INIT_ENV}
./src/carma-messenger/carma-messenger-core/docker/checkout.bash -r ${PWD}
cd ${PWD}
sudo apt-get update
- run:
name: Build CARMA
command: |
source ${INIT_ENV}
export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
build-wrapper-linux-x86-64 --out-dir /opt/carma/bw-output bash make_with_coverage.bash -m -e /opt/carma/ -o ./coverage_reports/gcov
make_with_coverage.bash -m -e /opt/carma/ -o ./coverage_reports/gcov
- run:
name: Run C++ Tests
command: |
source ${INIT_ENV}
export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
bash make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov
make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov
# Run SonarCloud analysis
# PR Branchs and number extracted from Circle variables and github api
# Circle CI seems to make a change to the base branch, so we must fetch --force to ensure correct git file change stats
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Copyright (C) 2018-2022 LEIDOS.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.

# Configuration file for GitHub Actions
# CI will report failure if any executed command returns and error status
# Operations performed are as follows
# Build source code Documentation
# Run Doxygen Action
# Deploy documentation static webpage to gh-pages

name: Doxygen Action

# Controls when the action will run. Triggers the workflow on push or pull Request events but only for the develop branch
on:
workflow_dispatch:
push:
branches: [ develop ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Install graphvix to support Graph visualization and representing structural information as diagrams of abstract graphs and networks
- name: Install graphviz
run: sudo apt install graphviz && sudo dot -c
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Doxygen action for documentation of carma-platform source code by using mattnotmitt github actions workflow
- name: Doxygen Action
uses: mattnotmitt/doxygen-action@v1.9.4
with:
# Path to Doxyfile
doxyfile-path: "./Doxyfile" # default is ./Doxyfile
# Working directory
working-directory: "." # default is .
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
external_repository: usdot-fhwa-stol/documentation
publish_branch: gh-pages
# default: gh-pages
publish_dir: ./docs/html/
destination_dir: ${{ github.event.repository.name }}
9 changes: 8 additions & 1 deletion .sonarqube/sonar-scanner.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

sonar.projectKey=usdot-fhwa-stol_carma-messenger
sonar.organization=usdot-fhwa-stol
sonar.cfamily.build-wrapper-output=/opt/carma/bw-output
sonar.cfamily.cache.enabled=false
sonar.cfamily.compile-commands=/opt/carma/build/compile_commands.json
sonar.host.url=https://sonarcloud.io
sonar.sources=src/main
sonar.tests=src/test
sonar.cfamily.gcov.reportsPath=/opt/carma/coverage_reports/gcov
sonar.coverageReportPaths=/opt/carma/coverage_reports/gcov/coverage.xml
sonar.cpp.file.suffixes=.cpp,.h,.tpp
sonar.c.file.suffixes=-

# Set Git as SCM sensor
sonar.scm.disabled=false
Expand All @@ -40,8 +44,11 @@ traffic_incident.sonar.projectBaseDir = /opt/carma/src/carma-messenger/carma-mes
# C++ Package differences
# Sources
j2735_convertor.sonar.sources = src
j2735_convertor.sonar.exclusions =test/**
cpp_message.sonar.sources = src
cpp_message.sonar.exclusions =test/**
traffic_incident.sonar.sources = src
traffic_incident.sonar.exclusions =test/**

# Tests
# Note: For C++ setting this field does not cause test analysis to occur. It only allows the test source code to be evaluated.
Expand Down
Loading

0 comments on commit 68a288d

Please sign in to comment.