Skip to content

Commit

Permalink
Merge branch 'main' into humble
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsudome-r authored Jan 22, 2025
2 parents acd922a + fdc7c2d commit 6de9d34
Show file tree
Hide file tree
Showing 64 changed files with 6,024 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .cppcheck_suppressions
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*:*/test/*

missingInclude
missingIncludeSystem
unmatchedSuppression
unusedFunction
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
### Automatically generated from package.xml ###
common/autoware_geography_utils/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @autowarefoundation/autoware-core-global-codeowners
common/autoware_node/** [email protected] @autowarefoundation/autoware-core-global-codeowners
common/autoware_point_types/** [email protected] [email protected] [email protected] @autowarefoundation/autoware-core-global-codeowners
demos/autoware_test_node/** [email protected] @autowarefoundation/autoware-core-global-codeowners

### Copied from .github/CODEOWNERS-manual ###
.github/** @autowarefoundation/autoware-core-global-codeowners
1 change: 1 addition & 0 deletions .github/CODEOWNERS-manual
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.github/** @autowarefoundation/autoware-core-global-codeowners
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Upload coverage to CodeCov
if: ${{ steps.test.outputs.coverage-report-files != '' }}
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
files: ${{ steps.test.outputs.coverage-report-files }}
fail_ci_if_error: false
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ env:
CXX: /usr/lib/ccache/g++

jobs:
make-sure-label-is-present:
uses: autowarefoundation/autoware-github-actions/.github/workflows/make-sure-label-is-present.yaml@v1
require-label:
uses: autowarefoundation/autoware-github-actions/.github/workflows/require-label.yaml@v1
with:
label: tag:run-build-and-test-differential
label: run:build-and-test-differential

build-and-test-differential:
needs: make-sure-label-is-present
if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
needs: require-label
if: ${{ needs.require-label.outputs.result == 'true' }}
runs-on: ubuntu-24.04
container: ghcr.io/autowarefoundation/autoware:core-devel
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:

- name: Upload coverage to CodeCov
if: ${{ steps.test.outputs.coverage-report-files != '' }}
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
files: ${{ steps.test.outputs.coverage-report-files }}
fail_ci_if_error: false
Expand Down
80 changes: 80 additions & 0 deletions .github/workflows/bump-version-pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: bump-version-pr

on:
workflow_dispatch:
inputs:
version_part:
description: Which part of the version number to bump?
required: true
default: minor
type: choice
options:
- major
- minor
- patch

jobs:
bump-version-pr:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v4
with:
ref: humble
fetch-depth: 0

- name: Generate token
id: generate-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}

- name: Set git config
uses: autowarefoundation/autoware-github-actions/set-git-config@v1
with:
token: ${{ steps.generate-token.outputs.token }}

- name: Setup Python 3.x
uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Install dependencies
run: pip3 install -U catkin_tools
shell: bash

- name: Bump version from humble branch
id: bump-version-from-humble-branch
run: |
git checkout -b tmp/bot/bump_version_base
git fetch origin main
git merge origin/main
catkin_generate_changelog -y
git add *
git commit -m "update CHANGELOG.rst"
catkin_prepare_release -y --bump ${{ inputs.version_part }} --no-push
version=$(git describe --tags)
echo "version=${version}" >> $GITHUB_OUTPUT
shell: bash

- name: Create target branch
run: |
git checkout origin/main
git checkout -b chore/bot/bump_version
git merge tmp/bot/bump_version_base
git push origin chore/bot/bump_version --force
shell: bash

- name: Create PR
id: create-pr
run: >
gh
pr
create
--base=main
--body="Bump version to ${{ steps.bump-version-from-humble-branch.outputs.version }}"
--title="chore: bump version to ${{ steps.bump-version-from-humble-branch.outputs.version }}"
--head=chore/bot/bump_version
env:
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy-pr-comments-manually.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download analysis results
run: |
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Check out PR head
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
ref: ${{ steps.set-variables.outputs.pr-head-ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy-pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download analysis results
run: |
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Check out PR head
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
ref: ${{ steps.set-variables.outputs.pr-head-ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cppcheck-weekly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

# cppcheck from apt does not yet support --check-level args, and thus install from snap
- name: Install Cppcheck from snap
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-closed-pr-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
29 changes: 29 additions & 0 deletions common/autoware_kalman_filter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_kalman_filter)

find_package(autoware_cmake REQUIRED)
autoware_package()

find_package(eigen3_cmake_module REQUIRED)
find_package(Eigen3 REQUIRED)

include_directories(
SYSTEM
${EIGEN3_INCLUDE_DIR}
)

ament_auto_add_library(${PROJECT_NAME} SHARED
src/kalman_filter.cpp
src/time_delay_kalman_filter.cpp
include/autoware/kalman_filter/kalman_filter.hpp
include/autoware/kalman_filter/time_delay_kalman_filter.hpp
)

if(BUILD_TESTING)
file(GLOB_RECURSE test_files test/*.cpp)
ament_add_ros_isolated_gtest(test_${PROJECT_NAME} ${test_files})

target_link_libraries(test_${PROJECT_NAME} ${PROJECT_NAME})
endif()

ament_auto_package()
Loading

0 comments on commit 6de9d34

Please sign in to comment.