Skip to content

Commit a102779

Browse files
HansRoboHansRobo
authored
Merge branch 'tier4/main' into ci/dispatch-sim-evaluation-tools
2 parents d66e007 + dfe8598 commit a102779

File tree

2,236 files changed

+132521
-59373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,236 files changed

+132521
-59373
lines changed

‎.cspell-partial.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"ignorePaths": [
33
"**/perception/**",
4-
"**/planning/**",
5-
"**/sensing/**",
4+
"sensing/tier4_pcl_extensions/include/**",
65
"perception/bytetrack/lib/**"
76
],
87
"ignoreRegExpList": [],
9-
"words": []
8+
"words": ["dltype", "tvmgen", "quantizer", "imageio", "mimsave"]
109
}

‎.github/CODEOWNERS

+105-79
Large diffs are not rendered by default.

‎.github/dependabot.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ updates:
66
interval: daily
77
open-pull-requests-limit: 1
88
labels:
9-
- bot
10-
- github-actions
9+
- tag:bot
10+
- type:github-actions

‎.github/labeler.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
ci:
1+
"type:ci":
22
- .github/**/*
33
- "*.json"
44
- "*.yaml"
55
- "*.cfg"
66
- .clang-format
77
- .gitignore
88
- .prettierignore
9-
documentation:
9+
"type:documentation":
1010
- docs/**/*
1111
- "**/*.md"
1212
- "**/*.rst"
1313
- "**/*.jpg"
1414
- "**/*.png"
1515
- "**/*.svg"
16-
common:
16+
"component:common":
1717
- common/**/*
18-
control:
18+
"component:control":
1919
- control/**/*
20-
evaluator:
20+
"component:evaluator":
2121
- evaluator/**/*
22-
launch:
22+
"component:launch":
2323
- launch/**/*
24-
localization:
24+
"component:localization":
2525
- localization/**/*
26-
map:
26+
"component:map":
2727
- map/**/*
28-
perception:
28+
"component:perception":
2929
- perception/**/*
30-
planning:
30+
"component:planning":
3131
- planning/**/*
32-
sensing:
32+
"component:sensing":
3333
- sensing/**/*
34-
simulator:
34+
"component:simulation":
3535
- simulator/**/*
36-
system:
36+
"component:system":
3737
- system/**/*
38-
tools:
38+
"component:tools":
3939
- tools/**/*
40-
vehicle:
40+
"component:vehicle":
4141
- vehicle/**/*

‎.github/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
daysUntilClose: false
55

66
# Label to use when marking as stale
7-
staleLabel: stale
7+
staleLabel: status:stale
88

99
# Comment to post when marking as stale
1010
markComment: >

‎.github/sync-files.yaml

+4-14
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,6 @@
4242
- \"\"
4343
- -cuda
4444
include:" {source}
45-
- source: .github/workflows/build-and-test-differential.yaml
46-
pre-commands: |
47-
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
48-
49-
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
50-
sd -- \
51-
" include:" \
52-
" container-suffix:
53-
- \"\"
54-
- -cuda
55-
include:" {source}
56-
57-
sd "^ container: ghcr.io/autowarefoundation/autoware-universe:(\w+)-latest\$" \
58-
" container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {source}
5945
- source: .github/workflows/build-and-test-differential-self-hosted.yaml
6046
pre-commands: |
6147
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
@@ -98,4 +84,8 @@
9884
sd "/edit/main/docs/" "/edit/main/" {source}
9985
sd "docs_dir: .*" "docs_dir: ." {source}
10086
sd "assets/(\w+)" "docs/assets/\$1" {source}
87+
sd -- \
88+
" - macros" \
89+
" - macros:
90+
module_name: mkdocs_macros" {source}
10191
- source: docs/assets/js/mathjax.js

‎.github/workflows/beta-to-tier4-main-sync.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: beta-to-tier4-main-sync
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
source_branch:
7+
description: Source branch
8+
required: true
9+
type: string
10+
11+
jobs:
12+
sync-beta-branch:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Generate token
16+
id: generate-token
17+
uses: tibdex/github-app-token@v1
18+
with:
19+
app_id: ${{ secrets.APP_ID }}
20+
private_key: ${{ secrets.PRIVATE_KEY }}
21+
22+
- name: Run sync-branches
23+
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
24+
with:
25+
token: ${{ steps.generate-token.outputs.token }}
26+
base-branch: tier4/main
27+
sync-pr-branch: beta-to-tier4-main-sync
28+
sync-target-repository: https://github.com/tier4/autoware.universe.git
29+
sync-target-branch: ${{ inputs.source_branch }}
30+
pr-title: "chore: sync beta branch ${{ inputs.source_branch }} with tier4/main"
31+
pr-labels: |
32+
bot
33+
sync-beta-branch
34+
auto-merge-method: merge

‎.github/workflows/build-and-test-differential.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
prevent-no-label-execution:
1212
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
1313
with:
14-
label: run-build-and-test-differential
14+
label: tag:run-build-and-test-differential
1515

1616
build-and-test-differential:
1717
needs: prevent-no-label-execution

‎.github/workflows/cancel-previous-workflows.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Cancel previous runs
11-
uses: styfle/cancel-workflow-action@0.11.0
11+
uses: styfle/cancel-workflow-action@0.12.0
1212
with:
1313
workflow_id: all
1414
all_but_latest: true

‎.github/workflows/deploy-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
prevent-no-label-execution:
2323
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
2424
with:
25-
label: deploy-docs
25+
label: tag:deploy-docs
2626

2727
deploy-docs:
2828
needs: prevent-no-label-execution

‎.github/workflows/dispatch-push-event.yaml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: dispatch-push-event
2+
on:
3+
push:
4+
5+
jobs:
6+
search-dispatch-repo:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
include:
11+
- { version: beta/v0.3.**, dispatch-repo: pilot-auto.x1.eve }
12+
outputs:
13+
dispatch-repo: ${{ steps.search-dispatch-repo.outputs.value }}
14+
steps:
15+
- name: Search dispatch repo
16+
id: search-dispatch-repo
17+
run: |
18+
if [[ ${{ github.ref_name }} =~ ${{ matrix.version }} ]]; then
19+
echo ::set-output name=value::"${{ matrix.dispatch-repo }}"
20+
echo "Detected beta branch: ${{ github.ref_name }}"
21+
echo "Dispatch repository: ${{ matrix.dispatch-repo }}"
22+
fi
23+
24+
dispatch-push-event:
25+
runs-on: ubuntu-latest
26+
needs: search-dispatch-repo
27+
if: ${{ needs.search-dispatch-repo.outputs.dispatch-repo != '' }}
28+
steps:
29+
- name: Generate token
30+
id: generate-token
31+
uses: tibdex/github-app-token@v1
32+
with:
33+
app_id: ${{ secrets.INTERNAL_APP_ID }}
34+
private_key: ${{ secrets.INTERNAL_PRIVATE_KEY }}
35+
36+
# 注意: workflow_dispatchで指定するブランチはmain固定となっているため、dispatch-repoのmainブランチにupdate-beta-branch.yamlが存在することが前提条件。
37+
- name: Dispatch the update-beta-branch workflow
38+
run: |
39+
curl -L \
40+
-X POST \
41+
-H "Accept: application/vnd.github+json" \
42+
-H "Authorization: Bearer ${{ steps.generate-token.outputs.token }}" \
43+
-H "X-GitHub-Api-Version: 2022-11-28" \
44+
https://api.github.com/repos/tier4/${{ needs.search-dispatch-repo.outputs.dispatch-repo }}/actions/workflows/update-beta-branch.yaml/dispatches \
45+
-d '{"ref":"main"}'

‎.github/workflows/github-release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
echo "tag-name=${REF_NAME#beta/}" >> $GITHUB_OUTPUT
3131
3232
- name: Check out repository
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
fetch-depth: 0
3636
ref: ${{ steps.set-tag-name.outputs.ref-name }}

‎.github/workflows/openai-pr-reviewer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
prevent-no-label-execution:
2222
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
2323
with:
24-
label: openai-pr-reviewer
24+
label: tag:openai-pr-reviewer
2525
review:
2626
needs: prevent-no-label-execution
2727
if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}

‎.github/workflows/pre-commit-optional.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out repository
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414

‎.github/workflows/pre-commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
private_key: ${{ secrets.PRIVATE_KEY }}
1717

1818
- name: Check out repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
ref: ${{ github.event.pull_request.head.ref }}
2222

‎.github/workflows/spell-check-all.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: spell-check-all
22

33
on:
44
workflow_dispatch:
5+
schedule:
6+
- cron: 0 0 * * *
57

68
jobs:
79
spell-check-all:

‎.github/workflows/spell-check-differential.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out repository
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212

1313
- name: Run spell-check
1414
uses: autowarefoundation/autoware-github-actions/spell-check@v1

‎.github/workflows/sync-awf-latest.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: sync-awf-latest
2+
3+
on:
4+
schedule:
5+
- cron: 0 15 * * *
6+
workflow_dispatch:
7+
8+
jobs:
9+
sync-awf-latest:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- name: Commit Results
16+
run: |
17+
git config --local user.email "action@github.com"
18+
git config --local user.name "GitHub Action"
19+
20+
git checkout awf-latest
21+
git remote add awf https://github.com/autowarefoundation/autoware.universe
22+
git fetch awf main
23+
git rebase awf/main
24+
25+
git push origin awf-latest --force

‎.github/workflows/sync-files.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
with:
2929
token: ${{ steps.generate-token.outputs.token }}
3030
pr-labels: |
31-
bot
32-
sync-files
31+
tag:bot
32+
tag:sync-files
3333
auto-merge-method: squash

‎.github/workflows/sync-upstream.yaml

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
name: sync-upstream
22

33
on:
4-
schedule:
5-
- cron: 0 1 * * 1-5
64
workflow_dispatch:
5+
inputs:
6+
target_branch:
7+
description: Target branch
8+
required: true
9+
type: string
710

811
jobs:
912
sync-upstream:
@@ -28,14 +31,19 @@ jobs:
2831
script: |
2932
const holiday_jp = require(`${process.env.GITHUB_WORKSPACE}/node_modules/@holiday-jp/holiday_jp`)
3033
core.setOutput('holiday', holiday_jp.isHoliday(new Date()));
34+
- name: Print warning for invalid branch name
35+
if: ${{ inputs.target_branch == 'tier4/main' }}
36+
run: |
37+
echo This action cannot be performed on 'tier4/main' branch
38+
3139
- name: Run sync-branches
40+
if: ${{ inputs.target_branch != 'tier4/main' }}
3241
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
33-
if: ${{ steps.is-holiday.outputs.holiday != 'true' || github.event_name == 'workflow_dispatch' }}
3442
with:
3543
token: ${{ steps.generate-token.outputs.token }}
36-
base-branch: tier4/main
44+
base-branch: ${{ inputs.target_branch }}
3745
sync-pr-branch: sync-upstream
38-
sync-target-repository: https://github.com/autowarefoundation/autoware.universe.git
39-
sync-target-branch: main
40-
pr-title: "chore: sync upstream"
46+
sync-target-repository: https://github.com/tier4/autoware.universe.git
47+
sync-target-branch: awf-latest
48+
pr-title: "chore: sync tier4/autoware.universe:awf-latest"
4149
auto-merge-method: merge

‎.github/workflows/update-codeowners-from-packages.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
with:
2929
token: ${{ steps.generate-token.outputs.token }}
3030
pr-labels: |
31-
bot
32-
update-codeowners-from-packages
31+
tag:bot
32+
tag:update-codeowners-from-packages
3333
auto-merge-method: squash

‎common/autoware_ad_api_specs/package.xml

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<version>0.0.0</version>
66
<description>The autoware_ad_api_specs package</description>
77
<maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
8-
<maintainer email="makoto.yabuta@tier4.jp">yabuta</maintainer>
9-
<maintainer email="kahhooi.tan@tier4.jp">Kah Hooi Tan</maintainer>
108
<maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
119
<license>Apache License 2.0</license>
1210

‎common/autoware_auto_common/design/comparisons.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ The `exclusive_or` function will test whether two values cast to different boole
2222
## Example Usage
2323

2424
```c++
25-
#include "common/bool_comparisons.hpp"
26-
#include "common/float_comparisons.hpp"
25+
#include "autoware_auto_common/common/bool_comparisons.hpp"
26+
#include "autoware_auto_common/common/float_comparisons.hpp"
2727

2828
#include <iostream>
2929

0 commit comments

Comments
 (0)