From cbfd2c8f9548c275a22aed0210fd95578afd277f Mon Sep 17 00:00:00 2001 From: Tomoya Kimura Date: Fri, 19 Aug 2022 12:59:18 +0900 Subject: [PATCH 01/11] chore: change target branch name of sync-latest (#509) Signed-off-by: tomoya.kimura Signed-off-by: tomoya.kimura --- .github/workflows/sync-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-latest.yaml b/.github/workflows/sync-latest.yaml index 78ed50c264017..ce3ababc8a465 100644 --- a/.github/workflows/sync-latest.yaml +++ b/.github/workflows/sync-latest.yaml @@ -20,7 +20,7 @@ jobs: uses: autowarefoundation/autoware-github-actions/sync-branches@v1 with: token: ${{ steps.generate-token.outputs.token }} - base-branch: latest + base-branch: awf-latest sync-pr-branch: sync-latest sync-target-repository: https://github.com/tier4/pilot-auto sync-target-branch: tier4/universe From 36ec3b8125be178dbef0b9eb8dc3936a698b414e Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Fri, 19 Aug 2022 15:40:20 +0900 Subject: [PATCH 02/11] chore: update beta branch action (#510) --- .github/workflows/update-beta-branch.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-beta-branch.yaml b/.github/workflows/update-beta-branch.yaml index 29077ae3c3b5d..bdf4f121ea547 100644 --- a/.github/workflows/update-beta-branch.yaml +++ b/.github/workflows/update-beta-branch.yaml @@ -63,18 +63,19 @@ 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" committer: GitHub author: GitHub 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" body: | - update rc branch + update beta branch labels: | - update-rc-branch + bot + update-beta-branch draft: false - name: Check outputs From bd874dbc4eb54a3b3fff8ff7181d3ee1ecdfa05c Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Mon, 22 Aug 2022 09:44:52 +0900 Subject: [PATCH 03/11] ci: add update-ansible-galaxy-requirements.yaml (#513) Signed-off-by: Kenji Miyake Signed-off-by: Kenji Miyake --- .../update-ansible-galaxy-requirements.yaml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/workflows/update-ansible-galaxy-requirements.yaml diff --git a/.github/workflows/update-ansible-galaxy-requirements.yaml b/.github/workflows/update-ansible-galaxy-requirements.yaml new file mode 100644 index 0000000000000..15e5240a6cde6 --- /dev/null +++ b/.github/workflows/update-ansible-galaxy-requirements.yaml @@ -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): .*' \ + '$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: "" + 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 From 4f9bfd483960c7970efee8d263cfb337d533af2f Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Mon, 22 Aug 2022 09:53:47 +0900 Subject: [PATCH 04/11] ci(update-ansible-galaxy-requirements): update (#515) --- .github/workflows/update-ansible-galaxy-requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-ansible-galaxy-requirements.yaml b/.github/workflows/update-ansible-galaxy-requirements.yaml index 15e5240a6cde6..807af7fcc93bd 100644 --- a/.github/workflows/update-ansible-galaxy-requirements.yaml +++ b/.github/workflows/update-ansible-galaxy-requirements.yaml @@ -33,7 +33,7 @@ jobs: - name: Update clang-format version run: | sd -f ms \ - '(https://github.com/autowarefoundation/autoware.git#/ansible.*version): .*' \ + '(https://github.com/autowarefoundation/autoware.git#/ansible.*version): \w+' \ '$1: ${{ steps.get-latest-autoware-version.outputs.version }}' \ ansible-galaxy-requirements.yaml @@ -46,7 +46,7 @@ jobs: branch: update-ansible-galaxy-requirements title: "chore: update ansible-galaxy-requirements.yaml" commit-message: "chore: update ansible-galaxy-requirements.yaml" - body: "" + body: https://github.com/autowarefoundation/autoware/commit/${{ steps.get-latest-autoware-version.outputs.version }} labels: | bot dependencies From c89c65defc0eac3549f393d0a53742a5515a2687 Mon Sep 17 00:00:00 2001 From: "tier4-autoware-private-bot[bot]" <87871706+tier4-autoware-private-bot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 01:09:09 +0000 Subject: [PATCH 05/11] chore: update ansible-galaxy-requirements.yaml (#514) Signed-off-by: GitHub Signed-off-by: GitHub Co-authored-by: kenji-miyake --- ansible-galaxy-requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-galaxy-requirements.yaml b/ansible-galaxy-requirements.yaml index b724dd1e1d021..998888875d424 100644 --- a/ansible-galaxy-requirements.yaml +++ b/ansible-galaxy-requirements.yaml @@ -4,4 +4,4 @@ collections: - name: https://github.com/autowarefoundation/autoware.git#/ansible type: git - version: e108b8fa9e47307b1f2573be5d0dde828235bcb0 + version: b1e2f6ef5982ccbe9434bff49397b2783713cb98 From 8ffb774b8e6c230d95798ce4706d7102812d5c27 Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Mon, 22 Aug 2022 19:57:09 +0900 Subject: [PATCH 06/11] ci(sync-awf-latest): update workflow name (#512) Signed-off-by: Kenji Miyake Signed-off-by: Kenji Miyake --- .../workflows/{sync-latest.yaml => sync-awf-latest.yaml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{sync-latest.yaml => sync-awf-latest.yaml} (84%) diff --git a/.github/workflows/sync-latest.yaml b/.github/workflows/sync-awf-latest.yaml similarity index 84% rename from .github/workflows/sync-latest.yaml rename to .github/workflows/sync-awf-latest.yaml index ce3ababc8a465..b5246f1fe321c 100644 --- a/.github/workflows/sync-latest.yaml +++ b/.github/workflows/sync-awf-latest.yaml @@ -1,4 +1,4 @@ -name: sync-latest +name: sync-awf-latest on: schedule: @@ -21,11 +21,11 @@ jobs: with: token: ${{ steps.generate-token.outputs.token }} base-branch: awf-latest - sync-pr-branch: sync-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 From c33536d6645a3155ba71482a76cb17f614d20926 Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Tue, 23 Aug 2022 15:25:37 +0900 Subject: [PATCH 07/11] feat: split simulator repositories from autoware.proj.repos (#408) * feat: split simulator repositories from autoware.proj.repos Signed-off-by: Kenji Miyake * feat: update webauto-ci.yml to version 2 Signed-off-by: Kenji Miyake Co-authored-by: makoto tokunaga --- .webauto-ci.yml | 55 ++++++++++++++++++++++++++++++++----------------- autoware.repos | 17 --------------- simulator.repos | 17 +++++++++++++++ 3 files changed, 53 insertions(+), 36 deletions(-) create mode 100644 simulator.repos diff --git a/.webauto-ci.yml b/.webauto-ci.yml index 20386d13efbf7..c1bbd8b147f0e 100644 --- a/.webauto-ci.yml +++ b/.webauto-ci.yml @@ -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 diff --git a/autoware.repos b/autoware.repos index fb946f0649517..15b073b94a947 100644 --- a/autoware.repos +++ b/autoware.repos @@ -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 diff --git a/simulator.repos b/simulator.repos new file mode 100644 index 0000000000000..671451946756e --- /dev/null +++ b/simulator.repos @@ -0,0 +1,17 @@ +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 From 1b36f47961a3cd19c4b30d5e40b403ca75b74845 Mon Sep 17 00:00:00 2001 From: Hayato Mizushima Date: Tue, 23 Aug 2022 18:18:07 +0900 Subject: [PATCH 08/11] feat: add dependency package to simulator.repos (#519) * feat: add dependency package to simulator.repos * chore: change directory * chore: add directory --- simulator.repos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/simulator.repos b/simulator.repos index 671451946756e..150fab6310856 100644 --- a/simulator.repos +++ b/simulator.repos @@ -15,3 +15,7 @@ repositories: 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 From 3de1aaa273ab03ca39714153bb5ef77c15a5cfff Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Wed, 24 Aug 2022 19:18:00 +0900 Subject: [PATCH 09/11] feat: specify beta branch name in PR title created by update-beta-branch (#520) --- .github/workflows/update-beta-branch.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-beta-branch.yaml b/.github/workflows/update-beta-branch.yaml index bdf4f121ea547..cfbb4dfccda07 100644 --- a/.github/workflows/update-beta-branch.yaml +++ b/.github/workflows/update-beta-branch.yaml @@ -63,16 +63,16 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ steps.generate-token.outputs.token }} - commit-message: "chore: update beta branch" + commit-message: "chore: update beta branch for ${{ env.BASE_BRANCH }}" committer: GitHub author: GitHub signoff: false base: ${{ env.BASE_BRANCH }} branch: ${{ env.SYNC_BRANCH_PREFIX }}/${{ env.BASE_BRANCH }} delete-branch: true - title: "chore: update beta branch" + title: "chore: update beta branch for ${{ env.BASE_BRANCH }}" body: | - update beta branch + update beta branch for ${{ env.BASE_BRANCH }} labels: | bot update-beta-branch From 4eb11a3102f8cac2a8d8d8bef5382b552290725a Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Wed, 24 Aug 2022 20:39:27 +0900 Subject: [PATCH 10/11] ci: add auto-merge to update-beta-branch (#521) feat: add auto-merge to update-beta-branch --- .github/workflows/update-beta-branch.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/update-beta-branch.yaml b/.github/workflows/update-beta-branch.yaml index cfbb4dfccda07..1b0afa826dbe1 100644 --- a/.github/workflows/update-beta-branch.yaml +++ b/.github/workflows/update-beta-branch.yaml @@ -82,3 +82,11 @@ jobs: 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: ${{ inputs.token }} + pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }} + merge-method: squash From e3647f451240b997dd57e86f5ed29f9ab0ac946a Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Thu, 25 Aug 2022 14:06:10 +0900 Subject: [PATCH 11/11] ci: fix token for auto-merge in update-beta-branch (#522) --- .github/workflows/update-beta-branch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-beta-branch.yaml b/.github/workflows/update-beta-branch.yaml index 1b0afa826dbe1..983d999753d0c 100644 --- a/.github/workflows/update-beta-branch.yaml +++ b/.github/workflows/update-beta-branch.yaml @@ -87,6 +87,6 @@ jobs: if: ${{ steps.create-pr.outputs.pull-request-operation == 'created' }} uses: peter-evans/enable-pull-request-automerge@v2 with: - token: ${{ inputs.token }} + token: ${{ steps.generate-token.outputs.token }} pull-request-number: ${{ steps.create-pr.outputs.pull-request-number }} merge-method: squash