Skip to content

Commit

Permalink
Merge branch 'tier4/main' into ci/dispatch-sim-evaluation-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
HansRobo authored Feb 8, 2024
2 parents d66e007 + dfe8598 commit a102779
Show file tree
Hide file tree
Showing 2,236 changed files with 132,521 additions and 59,373 deletions.
5 changes: 2 additions & 3 deletions .cspell-partial.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"ignorePaths": [
"**/perception/**",
"**/planning/**",
"**/sensing/**",
"sensing/tier4_pcl_extensions/include/**",
"perception/bytetrack/lib/**"
],
"ignoreRegExpList": [],
"words": []
"words": ["dltype", "tvmgen", "quantizer", "imageio", "mimsave"]

Check warning on line 8 in .cspell-partial.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (dltype)

Check warning on line 8 in .cspell-partial.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (tvmgen)

Check warning on line 8 in .cspell-partial.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (quantizer)

Check warning on line 8 in .cspell-partial.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (imageio)

Check warning on line 8 in .cspell-partial.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (mimsave)
}
184 changes: 105 additions & 79 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ updates:
interval: daily
open-pull-requests-limit: 1
labels:
- bot
- github-actions
- tag:bot
- type:github-actions
30 changes: 15 additions & 15 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
ci:
"type:ci":
- .github/**/*
- "*.json"
- "*.yaml"
- "*.cfg"
- .clang-format
- .gitignore
- .prettierignore
documentation:
"type:documentation":
- docs/**/*
- "**/*.md"
- "**/*.rst"
- "**/*.jpg"
- "**/*.png"
- "**/*.svg"
common:
"component:common":
- common/**/*
control:
"component:control":
- control/**/*
evaluator:
"component:evaluator":
- evaluator/**/*
launch:
"component:launch":
- launch/**/*
localization:
"component:localization":
- localization/**/*
map:
"component:map":
- map/**/*
perception:
"component:perception":
- perception/**/*
planning:
"component:planning":
- planning/**/*
sensing:
"component:sensing":
- sensing/**/*
simulator:
"component:simulation":
- simulator/**/*
system:
"component:system":
- system/**/*
tools:
"component:tools":
- tools/**/*
vehicle:
"component:vehicle":
- vehicle/**/*
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
daysUntilClose: false

# Label to use when marking as stale
staleLabel: stale
staleLabel: status:stale

# Comment to post when marking as stale
markComment: >
Expand Down
18 changes: 4 additions & 14 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,6 @@
- \"\"
- -cuda
include:" {source}
- source: .github/workflows/build-and-test-differential.yaml
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
sd -- \
" include:" \
" container-suffix:
- \"\"
- -cuda
include:" {source}
sd "^ container: ghcr.io/autowarefoundation/autoware-universe:(\w+)-latest\$" \
" container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {source}
- source: .github/workflows/build-and-test-differential-self-hosted.yaml
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
Expand Down Expand Up @@ -98,4 +84,8 @@
sd "/edit/main/docs/" "/edit/main/" {source}
sd "docs_dir: .*" "docs_dir: ." {source}
sd "assets/(\w+)" "docs/assets/\$1" {source}
sd -- \
" - macros" \
" - macros:
module_name: mkdocs_macros" {source}
- source: docs/assets/js/mathjax.js
34 changes: 34 additions & 0 deletions .github/workflows/beta-to-tier4-main-sync.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: beta-to-tier4-main-sync

on:
workflow_dispatch:
inputs:
source_branch:
description: Source branch
required: true
type: string

jobs:
sync-beta-branch:
runs-on: ubuntu-latest
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}

- name: Run sync-branches
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
with:
token: ${{ steps.generate-token.outputs.token }}
base-branch: tier4/main
sync-pr-branch: beta-to-tier4-main-sync
sync-target-repository: https://github.com/tier4/autoware.universe.git
sync-target-branch: ${{ inputs.source_branch }}
pr-title: "chore: sync beta branch ${{ inputs.source_branch }} with tier4/main"
pr-labels: |
bot
sync-beta-branch
auto-merge-method: merge
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 @@ -11,7 +11,7 @@ jobs:
prevent-no-label-execution:
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
with:
label: run-build-and-test-differential
label: tag:run-build-and-test-differential

build-and-test-differential:
needs: prevent-no-label-execution
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cancel-previous-workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
workflow_id: all
all_but_latest: true
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
prevent-no-label-execution:
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
with:
label: deploy-docs
label: tag:deploy-docs

deploy-docs:
needs: prevent-no-label-execution
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/dispatch-push-event.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: dispatch-push-event
on:
push:

jobs:
search-dispatch-repo:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- { version: beta/v0.3.**, dispatch-repo: pilot-auto.x1.eve }
outputs:
dispatch-repo: ${{ steps.search-dispatch-repo.outputs.value }}
steps:
- name: Search dispatch repo
id: search-dispatch-repo
run: |
if [[ ${{ github.ref_name }} =~ ${{ matrix.version }} ]]; then
echo ::set-output name=value::"${{ matrix.dispatch-repo }}"
echo "Detected beta branch: ${{ github.ref_name }}"
echo "Dispatch repository: ${{ matrix.dispatch-repo }}"
fi
dispatch-push-event:
runs-on: ubuntu-latest
needs: search-dispatch-repo
if: ${{ needs.search-dispatch-repo.outputs.dispatch-repo != '' }}
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
with:
app_id: ${{ secrets.INTERNAL_APP_ID }}
private_key: ${{ secrets.INTERNAL_PRIVATE_KEY }}

# 注意: workflow_dispatchで指定するブランチはmain固定となっているため、dispatch-repoのmainブランチにupdate-beta-branch.yamlが存在することが前提条件。
- name: Dispatch the update-beta-branch workflow
run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ steps.generate-token.outputs.token }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/tier4/${{ needs.search-dispatch-repo.outputs.dispatch-repo }}/actions/workflows/update-beta-branch.yaml/dispatches \
-d '{"ref":"main"}'
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "tag-name=${REF_NAME#beta/}" >> $GITHUB_OUTPUT
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ steps.set-tag-name.outputs.ref-name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/openai-pr-reviewer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
prevent-no-label-execution:
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
with:
label: openai-pr-reviewer
label: tag:openai-pr-reviewer
review:
needs: prevent-no-label-execution
if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
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/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
private_key: ${{ secrets.PRIVATE_KEY }}

- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/spell-check-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: spell-check-all

on:
workflow_dispatch:
schedule:
- cron: 0 0 * * *

jobs:
spell-check-all:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell-check-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run spell-check
uses: autowarefoundation/autoware-github-actions/spell-check@v1
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/sync-awf-latest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: sync-awf-latest

on:
schedule:
- cron: 0 15 * * *
workflow_dispatch:

jobs:
sync-awf-latest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Commit Results
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git checkout awf-latest
git remote add awf https://github.com/autowarefoundation/autoware.universe
git fetch awf main
git rebase awf/main
git push origin awf-latest --force
4 changes: 2 additions & 2 deletions .github/workflows/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
with:
token: ${{ steps.generate-token.outputs.token }}
pr-labels: |
bot
sync-files
tag:bot
tag:sync-files
auto-merge-method: squash
22 changes: 15 additions & 7 deletions .github/workflows/sync-upstream.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: sync-upstream

on:
schedule:
- cron: 0 1 * * 1-5
workflow_dispatch:
inputs:
target_branch:
description: Target branch
required: true
type: string

jobs:
sync-upstream:
Expand All @@ -28,14 +31,19 @@ jobs:
script: |
const holiday_jp = require(`${process.env.GITHUB_WORKSPACE}/node_modules/@holiday-jp/holiday_jp`)
core.setOutput('holiday', holiday_jp.isHoliday(new Date()));
- name: Print warning for invalid branch name
if: ${{ inputs.target_branch == 'tier4/main' }}
run: |
echo This action cannot be performed on 'tier4/main' branch
- name: Run sync-branches
if: ${{ inputs.target_branch != 'tier4/main' }}
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
if: ${{ steps.is-holiday.outputs.holiday != 'true' || github.event_name == 'workflow_dispatch' }}
with:
token: ${{ steps.generate-token.outputs.token }}
base-branch: tier4/main
base-branch: ${{ inputs.target_branch }}
sync-pr-branch: sync-upstream
sync-target-repository: https://github.com/autowarefoundation/autoware.universe.git
sync-target-branch: main
pr-title: "chore: sync upstream"
sync-target-repository: https://github.com/tier4/autoware.universe.git
sync-target-branch: awf-latest
pr-title: "chore: sync tier4/autoware.universe:awf-latest"
auto-merge-method: merge
4 changes: 2 additions & 2 deletions .github/workflows/update-codeowners-from-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
with:
token: ${{ steps.generate-token.outputs.token }}
pr-labels: |
bot
update-codeowners-from-packages
tag:bot
tag:update-codeowners-from-packages
auto-merge-method: squash
2 changes: 0 additions & 2 deletions common/autoware_ad_api_specs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<version>0.0.0</version>
<description>The autoware_ad_api_specs package</description>
<maintainer email="[email protected]">Takagi, Isamu</maintainer>
<maintainer email="[email protected]">yabuta</maintainer>
<maintainer email="[email protected]">Kah Hooi Tan</maintainer>
<maintainer email="[email protected]">Ryohsuke Mitsudome</maintainer>
<license>Apache License 2.0</license>

Expand Down
4 changes: 2 additions & 2 deletions common/autoware_auto_common/design/comparisons.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ The `exclusive_or` function will test whether two values cast to different boole
## Example Usage

```c++
#include "common/bool_comparisons.hpp"
#include "common/float_comparisons.hpp"
#include "autoware_auto_common/common/bool_comparisons.hpp"
#include "autoware_auto_common/common/float_comparisons.hpp"

#include <iostream>

Expand Down
Loading

0 comments on commit a102779

Please sign in to comment.