fix: merge tier4/autoware.universe:tier4/main #1225

takayuki5168 · 2024-04-04T10:18:56Z

Description

無印リリースのbetaブランチをtier4/mainではなくawf-latestブランチからマージすることになったため、tier4/mainとawf-latestの差分を今回のbetaブランチに直接マージする

Tests performed

Effects on system behavior

Pre-review checklist for the PR author

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

I've confirmed the contribution guidelines.
The PR follows the pull request guidelines.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

The PR follows the pull request guidelines.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

There are no open discussions or they are tracked via tickets.

After all checkboxes are checked, anyone who has write access can merge the PR.

chore: sync upstream

feat(start_planner): cherry pick

feat(intersection): cherry pick awf autowarefoundation#6036, autowarefoundation#6042, autowarefoundation#6050

chore: sync beta branch beta/v0.20.0 with tier4/main

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

* feat: sync with awf/autoware.universe by force-push Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com> * fix Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com> --------- Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

chore: sync upstream

chore: sync beta branch beta/v0.21.0 with tier4/main

chore: sync upstream

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

chore: sync beta branch beta/v0.22.0 with tier4/main

chore: sync tier4/autoware.universe:awf-latest

chore: sync beta branch beta/v0.23.0 with tier4/main

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

chore: sync tier4/autoware.universe:awf-latest

…6566) Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

fix(drivable_area_expansion): fix invalid access (autowarefoundation#6566)

…ly_route_lanes is false and the arg is shoulder type (autowarefoundation#6567) Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

…nker (autowarefoundation#6558) consider backward completion Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

fix(start_planner): consider backward completion before preparing blinker (autowarefoundation#6558)

fix(route_handler): query shoulder lane in getLaneletSequence() if only_route_lanes is false and the arg is shoulder type (autowarefoundation#6567)

chore: sync beta branch beta/v0.24.0 with tier4/main

chore: sync tier4/autoware.universe:awf-latest

chore: sync beta branch beta/v0.25.0 with tier4/main

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

…0-fix

tier4-autoware-public-bot bot added 30 commits June 22, 2023 04:23

Merge pull request #602 from tier4/sync-upstream

31b892c

chore: sync upstream

Merge pull request #613 from tier4/sync-upstream

e20856f

chore: sync upstream

Merge pull request #617 from tier4/sync-upstream

2ecad48

chore: sync upstream

Merge pull request #624 from tier4/sync-upstream

84f709d

chore: sync upstream

Merge pull request #628 from tier4/sync-upstream

49bb76c

chore: sync upstream

Merge pull request #629 from tier4/sync-upstream

0ee9f89

chore: sync upstream

Merge pull request #633 from tier4/sync-upstream

345065a

chore: sync upstream

Merge pull request #636 from tier4/sync-upstream

39a6633

chore: sync upstream

Merge pull request #639 from tier4/sync-upstream

270fe57

chore: sync upstream

Merge pull request #641 from tier4/sync-upstream

9319d04

chore: sync upstream

Merge pull request #644 from tier4/sync-upstream

11890ea

chore: sync upstream

Merge pull request #646 from tier4/sync-upstream

001e833

chore: sync upstream

Merge pull request #648 from tier4/sync-upstream

65525a8

chore: sync upstream

Merge pull request #654 from tier4/sync-upstream

abceb49

chore: sync upstream

Merge pull request #656 from tier4/sync-upstream

725abbf

chore: sync upstream

Merge pull request #658 from tier4/sync-upstream

7382681

chore: sync upstream

Merge pull request #660 from tier4/sync-upstream

3df8b10

chore: sync upstream

Merge pull request #662 from tier4/sync-upstream

1cce9f2

chore: sync upstream

Merge pull request #664 from tier4/sync-upstream

7f9d3b6

chore: sync upstream

Merge pull request #666 from tier4/sync-upstream

3ef28c6

chore: sync upstream

Merge pull request #668 from tier4/sync-upstream

90382d5

chore: sync upstream

Merge pull request #669 from tier4/sync-upstream

6081d38

chore: sync upstream

Merge pull request #670 from tier4/sync-upstream

6d31ad7

chore: sync upstream

Merge pull request #674 from tier4/sync-upstream

7ab9783

chore: sync upstream

Merge pull request #678 from tier4/sync-upstream

dbb1c9a

chore: sync upstream

Merge pull request #679 from tier4/sync-upstream

45204d2

chore: sync upstream

Merge pull request #680 from tier4/sync-upstream

192d3ed

chore: sync upstream

Merge pull request #684 from tier4/sync-upstream

b933abe

chore: sync upstream

Merge pull request #687 from tier4/sync-upstream

116204f

chore: sync upstream

Merge pull request #691 from tier4/sync-upstream

a9aa2d4

chore: sync upstream

kyoichi-sugahara and others added 26 commits January 12, 2024 13:57

Merge pull request #1092 from tier4/hotfix/v0.20.0/start_planner

d8f135f

feat(start_planner): cherry pick

Merge pull request #1091 from tier4/cherry-pick/intersection

a45f52a

feat(intersection): cherry pick awf autowarefoundation#6036, autowarefoundation#6042, autowarefoundation#6050

Merge pull request #1093 from tier4/beta-to-tier4-main-sync

c05b191

chore: sync beta branch beta/v0.20.0 with tier4/main

feat: add sync-awf-latest.yaml (#1096)

6f0fd05

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

Merge remote-tracking branch 'tier4/beta/v0.21.0' into sync-upstream

acf3357

Merge pull request #1116 from tier4/sync-upstream

21d1a1f

chore: sync upstream

Merge pull request #1119 from tier4/beta-to-tier4-main-sync

2117f81

chore: sync beta branch beta/v0.21.0 with tier4/main

Merge pull request #1130 from tier4/sync-upstream

2851b2f

chore: sync upstream

feat: use tier4/awf-latest for upstream sync (#1131)

dfe8598

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

Merge pull request #1142 from tier4/beta-to-tier4-main-sync

271f71a

chore: sync beta branch beta/v0.22.0 with tier4/main

Merge pull request #1153 from tier4/sync-upstream

94e5f48

chore: sync tier4/autoware.universe:awf-latest

Merge pull request #1158 from tier4/beta-to-tier4-main-sync

9049444

chore: sync beta branch beta/v0.23.0 with tier4/main

feat(workflow): modify workflow from sync-awf-latest workflow (#1167)

1bebdab

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

Merge pull request #1175 from tier4/sync-upstream

efeda95

chore: sync tier4/autoware.universe:awf-latest

fix(drivable_area_expansion): fix invalid access (autowarefoundation#…

63e6fa8

…6566) Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

Merge pull request #1181 from tier4/hotfix/v0.24.0/drivable-area

269cd28

fix(drivable_area_expansion): fix invalid access (autowarefoundation#6566)

fix(route_handler): query shoulder lane in getLaneletSequence() if on…

0c4771e

…ly_route_lanes is false and the arg is shoulder type (autowarefoundation#6567) Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

fix(start_planner): consider backward completion before preparing bli…

9a70e23

…nker (autowarefoundation#6558) consider backward completion Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>

Merge pull request #1183 from tier4/cherry-pick/pr6558

bb387e8

fix(start_planner): consider backward completion before preparing blinker (autowarefoundation#6558)

Merge pull request #1182 from tier4/cherry-pick/pr6567

164ab15

fix(route_handler): query shoulder lane in getLaneletSequence() if only_route_lanes is false and the arg is shoulder type (autowarefoundation#6567)

Merge pull request #1184 from tier4/beta-to-tier4-main-sync

ee9a54e

chore: sync beta branch beta/v0.24.0 with tier4/main

Merge pull request #1202 from tier4/sync-upstream

0b70d0b

chore: sync tier4/autoware.universe:awf-latest

Merge pull request #1208 from tier4/beta-to-tier4-main-sync

c608bbf

chore: sync beta branch beta/v0.25.0 with tier4/main

feat: run sync-awf-latest every one hour (#1219)

c879a29

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>

Merge remote-tracking branch 'origin/tier4/main' into tmp/beta/v0.26.…

88a0876

…0-fix

github-actions bot added the type:ci label Apr 4, 2024

takayuki5168 marked this pull request as ready for review April 4, 2024 10:20

takayuki5168 closed this Apr 4, 2024

takayuki5168 deleted the tmp/beta/v0.26.0-fix branch April 4, 2024 10:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merge tier4/autoware.universe:tier4/main #1225

fix: merge tier4/autoware.universe:tier4/main #1225

takayuki5168 commented Apr 4, 2024 •

edited

Loading

fix: merge tier4/autoware.universe:tier4/main #1225

fix: merge tier4/autoware.universe:tier4/main #1225

Conversation

takayuki5168 commented Apr 4, 2024 • edited Loading

Description

Tests performed

Effects on system behavior

Pre-review checklist for the PR author

In-review checklist for the PR reviewers

Post-review checklist for the PR author

takayuki5168 commented Apr 4, 2024 •

edited

Loading