Skip to content

Commit b8b57d5

Browse files
TaikiYamada4TaikiYamada4
committed
Merge branch 'tier4/main' into chore/merge_tier4_main_to_beta_v0.44
Signed-off-by: TaikiYamada4 <taiki.yamada@tier4.jp>
2 parents 800fa43 + 1b81ca0 commit b8b57d5

13 files changed

+242
-10
lines changed

‎.github/CODEOWNERS renamed to ‎.github/_CODEOWNERS

File renamed without changes.

‎.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/clang-tidy-pr-comments-manually.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-22.04
1616
steps:
1717
- name: Check out repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Download analysis results
2121
run: |
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Check out PR head
4242
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
4646
ref: ${{ steps.set-variables.outputs.pr-head-ref }}

‎.github/workflows/clang-tidy-pr-comments.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Check out repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Download analysis results
2323
run: |
@@ -41,7 +41,7 @@ jobs:
4141
4242
- name: Check out PR head
4343
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
44-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
4545
with:
4646
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
4747
ref: ${{ steps.set-variables.outputs.pr-head-ref }}

‎.github/workflows/delete-closed-pr-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-22.04
1515
steps:
1616
- name: Check out repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020

‎.github/workflows/deploy-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-22.04
3535
steps:
3636
- name: Check out repository
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838
with:
3939
fetch-depth: 0
4040
ref: ${{ github.event.pull_request.head.sha }}

‎.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/dispatch-release-note.yaml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: dispatch-release-note
2+
on:
3+
push:
4+
branches:
5+
- beta/v*
6+
- tier4/main
7+
tags:
8+
- v*
9+
workflow_dispatch:
10+
inputs:
11+
beta-branch-or-tag-name:
12+
description: The name of the beta branch or tag to write release note
13+
type: string
14+
required: true
15+
jobs:
16+
dispatch-release-note:
17+
runs-on: ubuntu-latest
18+
name: release-repository-dispatch
19+
steps:
20+
- name: Set tag name
21+
id: set-tag-name
22+
run: |
23+
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
24+
REF_NAME="${{ github.event.inputs.beta-branch-or-tag-name }}"
25+
else
26+
REF_NAME="${{ github.ref_name }}"
27+
fi
28+
echo ::set-output name=ref-name::"$REF_NAME"
29+
echo ::set-output name=tag-name::"${REF_NAME#beta/}"
30+
31+
- name: Generate token
32+
id: generate-token
33+
uses: tibdex/github-app-token@v1
34+
with:
35+
app_id: ${{ secrets.APP_ID }}
36+
private_key: ${{ secrets.PRIVATE_KEY }}
37+
38+
- name: Repository dispatch for release note
39+
run: |
40+
curl \
41+
-X POST \
42+
-H "Accept: application/vnd.github+json" \
43+
-H "Authorization: token ${{ steps.generate-token.outputs.token }}" \
44+
-H "X-GitHub-Api-Version: 2022-11-28" \
45+
"https://api.github.com/repos/tier4/update-release-notes/dispatches" \
46+
-d '{"event_type":"${{ steps.set-tag-name.outputs.ref-name }}"}'

‎.github/workflows/slack-send.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: slack-send
2+
on:
3+
workflow_run:
4+
workflows:
5+
- build-and-test
6+
types:
7+
- completed
8+
9+
jobs:
10+
on-failure:
11+
if: ${{ github.event.workflow_run.conclusion == 'failure' }}
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out repository
15+
uses: actions/checkout@v3
16+
17+
- name: Send to Slack workflow
18+
uses: slackapi/slack-github-action@v1
19+
with:
20+
payload: |
21+
{
22+
"workflow-url": "${{ github.event.workflow_run.html_url }}"
23+
}
24+
env:
25+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WORKFLOW_WEBHOOK_URL }}

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

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: sync-awf-latest
2+
3+
on:
4+
schedule:
5+
- cron: 50 */1 * * * # every 1 hour (**:50)
6+
workflow_dispatch:
7+
8+
jobs:
9+
sync-awf-latest:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Generate token
13+
id: generate-token
14+
uses: tibdex/github-app-token@v1
15+
with:
16+
app_id: ${{ secrets.APP_ID }}
17+
private_key: ${{ secrets.PRIVATE_KEY }}
18+
19+
- name: Run sync-branches
20+
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
21+
with:
22+
token: ${{ steps.generate-token.outputs.token }}
23+
base-branch: awf-latest
24+
sync-pr-branch: sync-awf-latest
25+
sync-target-repository: https://github.com/autowarefoundation/autoware.universe.git
26+
sync-target-branch: main
27+
pr-title: "chore: sync awf-latest"
28+
pr-labels: |
29+
bot
30+
auto-merge-method: merge

‎.github/workflows/sync-upstream.yaml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: sync-upstream
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
target_branch:
7+
description: Target branch
8+
required: true
9+
type: string
10+
11+
jobs:
12+
sync-upstream:
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+
- uses: actions/setup-node@v3
23+
with:
24+
node-version: 16
25+
26+
- run: npm install @holiday-jp/holiday_jp
27+
28+
- uses: actions/github-script@v6
29+
id: is-holiday
30+
with:
31+
script: |
32+
const holiday_jp = require(`${process.env.GITHUB_WORKSPACE}/node_modules/@holiday-jp/holiday_jp`)
33+
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+
39+
- name: Run sync-branches
40+
if: ${{ inputs.target_branch != 'tier4/main' }}
41+
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
42+
with:
43+
token: ${{ steps.generate-token.outputs.token }}
44+
base-branch: ${{ inputs.target_branch }}
45+
sync-pr-branch: 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"
49+
auto-merge-method: merge

‎.pre-commit-config.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ repos:
4141
hooks:
4242
- id: yamllint
4343

44+
- repo: https://github.com/autowarefoundation/autoware-guideline-check
45+
rev: 0.1.0
46+
hooks:
47+
- id: check-package-depends
48+
4449
- repo: https://github.com/tier4/pre-commit-hooks-ros
4550
rev: v0.10.0
4651
hooks:
@@ -74,7 +79,7 @@ repos:
7479
args: [--line-length=100]
7580

7681
- repo: https://github.com/pre-commit/mirrors-clang-format
77-
rev: v19.1.5
82+
rev: v19.1.6
7883
hooks:
7984
- id: clang-format
8085
types_or: [c++, c, cuda]

‎mkdocs.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ plugins:
6363
module_name: mkdocs_macros
6464
- mkdocs-video
6565
- same-dir
66-
# https://squidfunk.github.io/mkdocs-material/plugins/search/#config.separator
67-
- search:
68-
separator: '[\s\-_,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;'
66+
- search
6967

7068
markdown_extensions:
7169
- abbr

0 commit comments

Comments
 (0)