Skip to content

Commit

Permalink
Merge pull request autowarefoundation#61 from tier4/sync-upstream
Browse files Browse the repository at this point in the history
sync upstream
  • Loading branch information
tier4-autoware-private-bot[bot] authored Aug 17, 2021
2 parents 3acf98c + 075554e commit a380a84
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 10 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ on:
jobs:
build:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
branch:
- main
- develop

steps:
# https://github.community/t/bug-strange-no-space-left-on-device-ioexceptions-on-github-runners/17616
Expand All @@ -26,6 +32,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
with:
ref: ${{ matrix.branch }}

- name: Install pip
run: |
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/generate-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- master
- develop
paths:
- "mkdocs.yml"
- "**/*.md"
Expand All @@ -14,7 +14,7 @@ on:
pull_request:
branches:
- main
- master
- develop
paths:
- "mkdocs.yml"
- "**/*.md"
Expand All @@ -32,9 +32,8 @@ jobs:

steps:
- name: Extract branch name
shell: bash
run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
id: extract_branch
run: echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"

- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/spell_check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Check spelling

on:
pull_request:
branches:
- main

jobs:
spellcheck:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/vcs-import.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ name: vcs import

on:
pull_request:
branches:
- main
paths:
- "autoware.proj.repos"
workflow_dispatch:

jobs:
vcs-import:
runs-on: ubuntu-latest
container: osrf/ros:galactic-desktop
container: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest

steps:
- name: Checkout repository
Expand Down Expand Up @@ -45,4 +43,4 @@ jobs:
run: |
apt-get -y update
rosdep update
rosdep install -y --from-paths . --ignore-src --rosdistro galactic
DEBIAN_FRONTEND=noninteractive rosdep install -y --from-paths . --ignore-src --rosdistro galactic
10 changes: 10 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,14 @@ repos:
hooks:
- id: prettier

- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.12
hooks:
- id: shellcheck

- repo: https://github.com/hadolint/hadolint
rev: v2.6.1
hooks:
- id: hadolint

exclude: ".svg"
1 change: 1 addition & 0 deletions ansible/roles/autoware/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
name:
- gdown
executable: pip3
become: yes

- name: Autoware (install geographiclib-tools)
apt:
Expand Down
4 changes: 4 additions & 0 deletions autoware.proj.repos
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ repositories:
type: git
url: https://github.com/tier4/pointcloud_to_laserscan.git
version: tier4/main
vendor/ars408_driver:
type: git
url: https://github.com/tier4/ars408_driver.git
version: tier4/ros2
vendor/ros2_socketcan:
type: git
url: https://github.com/tier4/ros2_socketcan.git
Expand Down

0 comments on commit a380a84

Please sign in to comment.