Skip to content

Commit

Permalink
Merge branch 'main' into feature/reference-obstacle-velocity-planner
Browse files Browse the repository at this point in the history
  • Loading branch information
takayuki5168 authored May 25, 2022
2 parents ea0a5dc + d9cc4fe commit b5c42d8
Show file tree
Hide file tree
Showing 839 changed files with 14,329 additions and 11,299 deletions.
7 changes: 7 additions & 0 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- source: .github/PULL_REQUEST_TEMPLATE/standard-change.md
- source: .github/dependabot.yaml
- source: .github/stale.yml
- source: .github/workflows/github-release.yaml
- source: .github/workflows/pre-commit.yaml
- source: .github/workflows/pre-commit-optional.yaml
- source: .github/workflows/semantic-pull-request.yaml
Expand All @@ -30,11 +31,17 @@
- repository: autowarefoundation/autoware_common
files:
- source: .github/workflows/build-and-test.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: .github/workflows/build-and-test-differential.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: .github/workflows/build-and-test-differential-self-hosted.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: .github/workflows/build-and-test-self-hosted.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: .github/workflows/check-build-depends.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: .github/workflows/clang-tidy-pr-comments.yaml
post-commands: 'sd "container: ros:\w+" "container: ghcr.io/autowarefoundation/autoware-universe:latest" {dest}'
- source: codecov.yaml

- repository: autowarefoundation/autoware-documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

clang-tidy-differential:
runs-on: ubuntu-latest
container: ros:galactic
container: ghcr.io/autowarefoundation/autoware-universe:latest
needs: build-and-test-differential
steps:
- name: Check out repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
cp /tmp/clang-tidy-result/fixes.yaml fixes.yaml
- name: Run clang-tidy-pr-comments action
uses: platisd/clang-tidy-pr-comments@1.1.6
uses: platisd/clang-tidy-pr-comments@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
clang_tidy_fixes: fixes.yaml
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: github-release

on:
push:
branches:
- beta/v*
tags:
- v*
workflow_dispatch:
inputs:
beta-branch-or-tag-name:
description: The name of the beta branch or tag to release
type: string
required: true

jobs:
github-release:
runs-on: ubuntu-latest
steps:
- name: Set tag name
id: set-tag-name
run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
REF_NAME="${{ github.event.inputs.beta-branch-or-tag-name }}"
else
REF_NAME="${{ github.ref_name }}"
fi
echo ::set-output name=ref-name::"$REF_NAME"
echo ::set-output name=tag-name::"${REF_NAME#beta/}"
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ steps.set-tag-name.outputs.ref-name }}

- name: Set target name for beta branches
id: set-target-name
run: |
if [[ "${{ steps.set-tag-name.outputs.ref-name }}" =~ "beta/" ]]; then
echo ::set-output name=target-name::"${{ steps.set-tag-name.outputs.ref-name }}"
fi
- name: Create a local tag for beta branches
run: |
if [ "${{ steps.set-target-name.outputs.target-name }}" != "" ]; then
git tag "${{ steps.set-tag-name.outputs.tag-name }}"
fi
- name: Run generate-changelog
id: generate-changelog
uses: autowarefoundation/autoware-github-actions/generate-changelog@v1

- name: Select verb
id: select-verb
run: |
has_previous_draft=$(gh release view --json isDraft -q ".isDraft" "${{ steps.set-tag-name.outputs.tag-name }}") || true
verb=create
if [ "$has_previous_draft" = "true" ]; then
verb=edit
fi
echo ::set-output name=verb::"$verb"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Release to GitHub
run: |
gh release ${{ steps.select-verb.outputs.verb }} "${{ steps.set-tag-name.outputs.tag-name }}" \
--draft \
--target "${{ steps.set-target-name.outputs.target-name }}" \
--title "Release ${{ steps.set-tag-name.outputs.tag-name }}" \
--notes "$NOTES"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NOTES: ${{ steps.generate-changelog.outputs.changelog }}
7 changes: 7 additions & 0 deletions .github/workflows/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ on:
workflow_dispatch:

jobs:
check-secret:
uses: autowarefoundation/autoware-github-actions/.github/workflows/check-secret.yaml@v1
secrets:
secret: ${{ secrets.APP_ID }}

sync-files:
needs: check-secret
if: ${{ needs.check-secret.outputs.set == 'true' }}
runs-on: ubuntu-latest
steps:
- name: Generate token
Expand Down
3 changes: 3 additions & 0 deletions .markdown-link-check.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"ignorePatterns": [
{
"pattern": "^http://localhost"
},
{
"pattern": "^https://github.com/.*/discussions/new"
}
],
"retryOn429": true,
Expand Down
25 changes: 5 additions & 20 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ repos:
- id: yamllint

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.6.0
rev: v0.7.0
hooks:
- id: flake8-ros
- id: prettier-xacro
- id: prettier-launch-xml
- id: prettier-package-xml
- id: sort-package-xml
- id: ros-include-guard
- id: sort-package-xml

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.4
Expand All @@ -65,24 +66,8 @@ repos:
- id: black
args: [--line-length=100]

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
additional_dependencies:
[
flake8-blind-except,
flake8-builtins,
flake8-class-newline,
flake8-comprehensions,
flake8-deprecated,
flake8-docstrings,
flake8-import-order,
flake8-quotes,
]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v13.0.1
rev: v14.0.1
hooks:
- id: clang-format
types_or: [c++, c, cuda]
Expand All @@ -94,4 +79,4 @@ repos:
args: [--quiet]
exclude: .cu

exclude: .svg|control/trajectory_follower|control/trajectory_follower_nodes|common/autoware_auto_cmake|common/autoware_auto_common|common/autoware_auto_geometry|common/autoware_auto_tf2|common/autoware_testing|common/fake_test_node|common/had_map_utils|common/motion_common|common/motion_testing|common/time_utils|common/vehicle_constants_manager|common/autoware_auto_perception_rviz_plugin|common/osqp_interface|simulator/simple_planning_simulator|planning/freespace_planner|planning/astar_search|planning/costmap_generator
exclude: .svg
15 changes: 15 additions & 0 deletions common/autoware_ad_api_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_ad_api_msgs)

find_package(autoware_cmake REQUIRED)
autoware_package()

rosidl_generate_interfaces(${PROJECT_NAME}
srv/InterfaceVersion.srv
DEPENDENCIES
builtin_interfaces
std_msgs
geometry_msgs
)

ament_auto_package()
17 changes: 17 additions & 0 deletions common/autoware_ad_api_msgs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# autoware_ad_api_msgs

## InterfaceVersion

This API provides the interface version of the set of AD APIs.
It follows [Semantic Versioning][semver] in order to provide an intuitive understanding of the changes between versions.

### Use cases

Considering the product life cycle, there will be multiple vehicles that use different versions of the AD API due to changes in requirements or some improvements.
For example, a vehicle uses `v1` for stability and another vehicle uses `v2` for more functionality.

In that situation, the AD API users such as developers of a Web service have to switch the application behavior based on the version that each vehicle uses.

<!-- link -->

[semver]: https://semver.org/
30 changes: 30 additions & 0 deletions common/autoware_ad_api_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>autoware_ad_api_msgs</name>
<version>0.0.0</version>
<description>The autoware_ad_api_msgs package</description>
<maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<build_depend>builtin_interfaces</build_depend>
<build_depend>rosidl_default_generators</build_depend>

<depend>geometry_msgs</depend>
<depend>std_msgs</depend>

<exec_depend>builtin_interfaces</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>

<member_of_group>rosidl_interface_packages</member_of_group>

<export>
<build_type>ament_cmake</build_type>
</export>
</package>
4 changes: 4 additions & 0 deletions common/autoware_ad_api_msgs/srv/InterfaceVersion.srv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
uint16 major
uint16 minor
uint16 patch
33 changes: 0 additions & 33 deletions common/autoware_auto_cmake/CMakeLists.txt

This file was deleted.

16 changes: 0 additions & 16 deletions common/autoware_auto_cmake/autoware_auto_cmake-extras.cmake

This file was deleted.

Loading

0 comments on commit b5c42d8

Please sign in to comment.