Skip to content

Commit

Permalink
Merge pull request #516 from tier4/sync-awf-latest
Browse files Browse the repository at this point in the history
chore: sync awf-latest
  • Loading branch information
kenji-miyake authored Aug 26, 2022
2 parents 3faecd4 + e3647f4 commit c904727
Show file tree
Hide file tree
Showing 7 changed files with 144 additions and 46 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: sync-latest
name: sync-awf-latest

on:
schedule:
Expand All @@ -20,12 +20,12 @@ jobs:
uses: autowarefoundation/autoware-github-actions/sync-branches@v1
with:
token: ${{ steps.generate-token.outputs.token }}
base-branch: latest
sync-pr-branch: sync-latest
base-branch: awf-latest
sync-pr-branch: sync-awf-latest
sync-target-repository: https://github.com/tier4/pilot-auto
sync-target-branch: tier4/universe
pr-title: "chore: sync latest"
pr-title: "chore: sync awf-latest"
pr-labels: |
bot
sync-latest
sync-awf-latest
auto-merge-method: merge
68 changes: 68 additions & 0 deletions .github/workflows/update-ansible-galaxy-requirements.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: update-ansible-galaxy-requirements

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

jobs:
update-ansible-galaxy-requirements:
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: Check out repository
uses: actions/checkout@v3

- name: Set up sd
uses: kenji-miyake/setup-sd@v1

- name: Get latest Autoware version
id: get-latest-autoware-version
run: |
latest_hash=$(git ls-remote --heads https://github.com/autowarefoundation/autoware.git refs/heads/main | awk '{print $1}')
echo ::set-output name=version::"$latest_hash"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Update clang-format version
run: |
sd -f ms \
'(https://github.com/autowarefoundation/autoware.git#/ansible.*version): \w+' \
'$1: ${{ steps.get-latest-autoware-version.outputs.version }}' \
ansible-galaxy-requirements.yaml
- name: Create PR
id: create-pr
uses: peter-evans/create-pull-request@v4
with:
token: ${{ steps.generate-token.outputs.token }}
base: ${{ github.event.repository.default_branch }}
branch: update-ansible-galaxy-requirements
title: "chore: update ansible-galaxy-requirements.yaml"
commit-message: "chore: update ansible-galaxy-requirements.yaml"
body: https://github.com/autowarefoundation/autoware/commit/${{ steps.get-latest-autoware-version.outputs.version }}
labels: |
bot
dependencies
signoff: true
delete-branch: true

- name: Check outputs
run: |
echo "Pull Request Number - ${{ steps.create-pr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}"
shell: bash

- name: Enable auto-merge
if: ${{ steps.create-pr.outputs.pull-request-operation == 'created' }}
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ steps.generate-token.outputs.token }}
pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }}
merge-method: squash
17 changes: 13 additions & 4 deletions .github/workflows/update-beta-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,30 @@ jobs:
uses: peter-evans/create-pull-request@v4
with:
token: ${{ steps.generate-token.outputs.token }}
commit-message: "chore: update rc branch"
commit-message: "chore: update beta branch for ${{ env.BASE_BRANCH }}"
committer: GitHub <noreply@github.com>
author: GitHub <noreply@github.com>
signoff: false
base: ${{ env.BASE_BRANCH }}
branch: ${{ env.SYNC_BRANCH_PREFIX }}/${{ env.BASE_BRANCH }}
delete-branch: true
title: "chore: update rc branch"
title: "chore: update beta branch for ${{ env.BASE_BRANCH }}"
body: |
update rc branch
update beta branch for ${{ env.BASE_BRANCH }}
labels: |
update-rc-branch
bot
update-beta-branch
draft: false

- name: Check outputs
run: |
echo "Pull Request Number - ${{ steps.create-pr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}"
- name: Enable auto-merge
if: ${{ steps.create-pr.outputs.pull-request-operation == 'created' }}
uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ steps.generate-token.outputs.token }}
pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }}
merge-method: squash
55 changes: 36 additions & 19 deletions .webauto-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,39 @@
# and remote update (Over The Air update) to real cars.
# If you have any additional questions, please contact us at #tier4-dev channel.

services:
autoware:
type: roslaunch
package_name: autoware_launch
file_name: autoware.launch.xml
planning_simulator:
type: roslaunch
package_name: autoware_launch
file_name: planning_simulator.launch.xml
params:
vehicle_model: lexus
sensor_model: aip_xx1
planning_simulator_v2:
type: roslaunch
package_name: autoware_launch
file_name: planning_simulator.launch.xml
params:
vehicle_model: lexus
sensor_model: aip_xx1
version: 2

artifacts:
- name: main
build:
type: tier4/iv/main/amd64/v2

simulations:
- name: planning_sim_v2
type: planning_sim_v2
simulator:
deployment:
type: container
artifact: main
runtime:
type: simulator/standard1/amd64/medium
cpu: 8
memory: 16384
parameters:
vehicle_model: lexus
sensor_model: aip_xx1
autoware_launch_package: autoware_launch
autoware_launch_file: planning_simulator.launch.xml
architecture_type: awf/universe
initialize_duration: "45"

- name: log_sim_v2
type: log_sim_v2
simulator:
deployment:
type: container
artifact: main
runtime:
type: simulator/standard1/amd64/medium
cpu: 8
memory: 16384
2 changes: 1 addition & 1 deletion ansible-galaxy-requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ collections:

- name: https://github.com/autowarefoundation/autoware.git#/ansible
type: git
version: e108b8fa9e47307b1f2573be5d0dde828235bcb0
version: b1e2f6ef5982ccbe9434bff49397b2783713cb98
17 changes: 0 additions & 17 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,6 @@ repositories:
type: git
url: https://github.com/tier4/lexus_description.iv.git
version: tier4/universe
# simulator
simulator/scenario_simulator:
type: git
url: https://github.com/tier4/scenario_simulator_v2.git
version: master
simulator/logsim:
type: git
url: git@github.com:tier4/logsim.git
version: main
simulator/awml_evaluation:
type: git
url: git@github.com:tier4/AWMLevaluation.git
version: main
simulator/ndt_convergence_evaluation:
type: git
url: git@github.com:tier4/ndt_convergence_evaluation.git
version: feature/standalone
# ecu_system_setup
ecu_system_setup:
type: git
Expand Down
21 changes: 21 additions & 0 deletions simulator.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:
simulator/scenario_simulator:
type: git
url: https://github.com/tier4/scenario_simulator_v2.git
version: master
simulator/logsim:
type: git
url: git@github.com:tier4/logsim.git
version: main
simulator/awml_evaluation:
type: git
url: git@github.com:tier4/AWMLevaluation.git
version: main
simulator/ndt_convergence_evaluation:
type: git
url: git@github.com:tier4/ndt_convergence_evaluation.git
version: feature/standalone
simulator/vendor/ros2_numpy:
type: git
url: https://github.com/Box-Robotics/ros2_numpy.git
version: humble

0 comments on commit c904727

Please sign in to comment.