Skip to content

Commit f83aa0f

Browse files
rej55rej55
committed
Resolve conflicts
Signed-off-by: Fumiya Watanabe <[email protected]>
2 parents d6ef043 + 9b70c1b commit f83aa0f

26 files changed

+420
-193
lines changed

‎.github/PULL_REQUEST_TEMPLATE/small-change.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Not applicable.
1515

1616
Not applicable.
1717

18+
## Interface changes
19+
20+
<!-- Describe any changed interfaces, such as topics, services, or parameters, including debugging interfaces -->
21+
1822
## Pre-review checklist for the PR author
1923

2024
The PR author **must** check the checkboxes below when creating the PR.

‎.github/PULL_REQUEST_TEMPLATE/standard-change.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@
1818

1919
<!-- Describe any changed interfaces, such as topics, services, or parameters. -->
2020

21+
### ROS Topic Changes
22+
23+
<!-- | Topic Name | Type | Direction | Update Description | -->
24+
<!-- | ---------------- | ------------------- | --------- | ------------------------------------------------------------- | -->
25+
<!-- | `/example_topic` | `std_msgs/String` | Subscribe | Description of what the topic is used for in the system | -->
26+
<!-- | `/another_topic` | `sensor_msgs/Image` | Publish | Also explain if it is added / modified / deleted with the PR | -->
27+
28+
### ROS Parameter Changes
29+
30+
<!-- | Parameter Name | Default Value | Update Description | -->
31+
<!-- | -------------------- | ------------- | --------------------------------------------------- | -->
32+
<!-- | `example_parameters` | `1.0` | Describe the parameter and also explain the updates | -->
33+
2134
## Effects on system behavior
2235

2336
<!-- Describe how this PR affects the system behavior. -->

‎.github/dependabot.yaml

Lines changed: 2 additions & 2 deletions
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/stale.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- source: .github/PULL_REQUEST_TEMPLATE/small-change.md
1212
- source: .github/PULL_REQUEST_TEMPLATE/standard-change.md
1313
- source: .github/dependabot.yaml
14+
- source: .github/workflows/backport.yaml
1415
- source: .github/stale.yml
1516
- source: .github/workflows/github-release.yaml
1617
- source: .github/workflows/pre-commit.yaml

‎.github/update-sync-param-files.py

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎.github/workflows/backport.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: backport
2+
on:
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
8+
jobs:
9+
backport:
10+
runs-on: ubuntu-latest
11+
# Only react to merged PRs for security reasons.
12+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
13+
if: >
14+
github.event.pull_request.merged
15+
&& (
16+
github.event.action == 'closed'
17+
|| (
18+
github.event.action == 'labeled'
19+
&& contains(github.event.label.name, 'backport')
20+
)
21+
)
22+
steps:
23+
- name: Generate token
24+
id: generate-token
25+
uses: tibdex/github-app-token@v2
26+
with:
27+
app_id: ${{ secrets.APP_ID }}
28+
private_key: ${{ secrets.PRIVATE_KEY }}
29+
30+
- uses: tibdex/backport@v2
31+
with:
32+
github_token: ${{ steps.generate-token.outputs.token }}
33+
title_template: "<%= title %> (backport #<%= number %>)"

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

Lines changed: 34 additions & 0 deletions
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_launch.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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Get modified files
7676
id: get-modified-files
77-
uses: tj-actions/changed-files@v35
77+
uses: tj-actions/changed-files@v42
7878
with:
7979
files: |
8080
**/*.cpp

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ jobs:
2424
- name: Check out repository
2525
uses: actions/checkout@v4
2626

27+
- name: Free disk space (Ubuntu)
28+
uses: jlumbroso/[email protected]
29+
with:
30+
tool-cache: false
31+
dotnet: false
32+
swap-storage: false
33+
large-packages: false
34+
2735
- name: Remove exec_depend
2836
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
2937

@@ -56,3 +64,6 @@ jobs:
5664
fail_ci_if_error: false
5765
verbose: true
5866
flags: total
67+
68+
- name: Show disk space after the tasks
69+
run: df -h

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

Lines changed: 1 addition & 1 deletion
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/check-build-depends.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/comment-on-pr.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: comment-on-pr
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
branches:
8+
- beta/v0.[0-9]+.[1-9]+
9+
10+
jobs:
11+
comment:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Create comments
15+
run: |
16+
cat << EOF > comments
17+
### Merging guidelines for the beta branch
18+
Please use `Squash and merge` as the default.
19+
However, when incorporating multiple changes with cherry-pick, use a `Create a merge commit` to preserve the changes in the history.
20+
EOF
21+
- name: Post comments
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
URL: ${{ github.event.pull_request.html_url }}
25+
run: gh pr comment -F ./comments "${URL}"

‎.github/workflows/dispatch-release-note.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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 ref name
21+
id: set-ref-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::"${{ github.repository }}/'$REF_NAME'"
29+
- name: Generate token
30+
id: generate-token
31+
uses: tibdex/github-app-token@v1
32+
with:
33+
app_id: ${{ secrets.APP_ID }}
34+
private_key: ${{ secrets.PRIVATE_KEY }}
35+
36+
- name: Repository dispatch for release note
37+
run: |
38+
curl \
39+
-X POST \
40+
-H "Accept: application/vnd.github+json" \
41+
-H "Authorization: token ${{ steps.generate-token.outputs.token }}" \
42+
-H "X-GitHub-Api-Version: 2022-11-28" \
43+
"https://api.github.com/repos/tier4/update-release-notes/dispatches" \
44+
-d '{"event_type":"${{ steps.set-ref-name.outputs.ref-name }}"}'

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ jobs:
99
steps:
1010
- name: Check out repository
1111
uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
1214

1315
- name: Run pre-commit
1416
uses: autowarefoundation/autoware-github-actions/pre-commit@v1
1517
with:
1618
pre-commit-config: .pre-commit-config-optional.yaml
19+
base-branch: origin/${{ github.base_ref }}

‎.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Generate token
1212
id: generate-token
13-
uses: tibdex/github-app-token@v1
13+
uses: tibdex/github-app-token@v2
1414
with:
1515
app_id: ${{ secrets.APP_ID }}
1616
private_key: ${{ secrets.PRIVATE_KEY }}

0 commit comments

Comments
 (0)