Skip to content

Commit

Permalink
Merge branch 'main' into feat/add_new_tl_detector_onnx_donwload
Browse files Browse the repository at this point in the history
  • Loading branch information
badai-nguyen committed Jan 28, 2025
2 parents 5b0c5ca + 3c15855 commit 213f6a7
Show file tree
Hide file tree
Showing 11 changed files with 549 additions and 454 deletions.
28 changes: 28 additions & 0 deletions .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,32 @@ runs:
flavor: |
latest=false
- name: Docker meta for autoware:universe-visualization-devel
id: meta-universe-visualization-devel
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
tags: |
type=raw,value=universe-visualization-devel-${{ inputs.platform }}
type=raw,value=universe-visualization-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
type=ref,event=tag,prefix=universe-visualization-devel-,suffix=-${{ inputs.platform }}
bake-target: docker-metadata-action-universe-visualization-devel
flavor: |
latest=false
- name: Docker meta for autoware:universe-visualization
id: meta-universe-visualization
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
tags: |
type=raw,value=universe-visualization-${{ inputs.platform }}
type=raw,value=universe-visualization-${{ steps.date.outputs.date }}-${{ inputs.platform }}
type=ref,event=tag,prefix=universe-visualization-,suffix=-${{ inputs.platform }}
bake-target: docker-metadata-action-universe-visualization
flavor: |
latest=false
- name: Docker meta for autoware:universe-devel
id: meta-universe-devel
uses: docker/metadata-action@v5
Expand Down Expand Up @@ -229,6 +255,8 @@ runs:
${{ steps.meta-universe-planning-control.outputs.bake-file }}
${{ steps.meta-universe-vehicle-system-devel.outputs.bake-file }}
${{ steps.meta-universe-vehicle-system.outputs.bake-file }}
${{ steps.meta-universe-visualization-devel.outputs.bake-file }}
${{ steps.meta-universe-visualization.outputs.bake-file }}
${{ steps.meta-universe-devel.outputs.bake-file }}
${{ steps.meta-universe.outputs.bake-file }}
provenance: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
token: ${{ steps.generate-token.outputs.token }}
repo_name: autowarefoundation/autoware
parent_dir: .
targets: major minor patch
targets: major minor
base_branch: main
new_branch_prefix: feat/update-
autoware_repos_file_name: simulator.repos
Expand Down
32 changes: 9 additions & 23 deletions .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ name: github-release

on:
push:
branches:
- beta/v*
tags:
- v*
- "[0-9]+.[0-9]+.[0-9]+"
workflow_dispatch:
inputs:
beta-branch-or-tag-name:
description: The name of the beta branch or tag to release
tag-name:
description: The name of the tag to release
type: string
required: true

Expand All @@ -25,36 +23,24 @@ jobs:
id: set-tag-name
run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
REF_NAME="${{ github.event.inputs.beta-branch-or-tag-name }}"
REF_NAME="${{ github.event.inputs.tag-name }}"
else
REF_NAME="${{ github.ref_name }}"
fi
echo "ref-name=$REF_NAME" >> $GITHUB_OUTPUT
echo "tag-name=${REF_NAME#beta/}" >> $GITHUB_OUTPUT
echo "tag-name=$REF_NAME" >> $GITHUB_OUTPUT
- name: Check out repository
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ steps.set-tag-name.outputs.ref-name }}

- name: Set target name for beta branches
id: set-target-name
run: |
if [[ "${{ steps.set-tag-name.outputs.ref-name }}" =~ "beta/" ]]; then
echo "target-name=${{ steps.set-tag-name.outputs.ref-name }}" >> $GITHUB_OUTPUT
fi
- name: Create a local tag for beta branches
run: |
if [ "${{ steps.set-target-name.outputs.target-name }}" != "" ]; then
git tag "${{ steps.set-tag-name.outputs.tag-name }}"
fi
ref: ${{ steps.set-tag-name.outputs.tag-name }}

- name: Run generate-changelog
id: generate-changelog
uses: autowarefoundation/autoware-github-actions/generate-changelog@v1
with:
git-cliff-args: --tag-pattern "^(\d+)\.(\d+)\.(\d+)$" --latest

- name: Select verb
id: select-verb
Expand All @@ -74,7 +60,7 @@ jobs:
run: |
gh release ${{ steps.select-verb.outputs.verb }} "${{ steps.set-tag-name.outputs.tag-name }}" \
--draft \
--target "${{ steps.set-target-name.outputs.target-name }}" \
--target "main" \
--title "Release ${{ steps.set-tag-name.outputs.tag-name }}" \
--notes "$NOTES"
env:
Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# https://github.com/autowarefoundation/sync-file-templates
# To make changes, update the source repository and follow the guidelines in its README.

# https://pre-commit.ci/#configuration
ci:
autofix_commit_msg: "style(pre-commit-optional): autofix"
# we already have our own daily update mechanism, we set this to quarterly
autoupdate_schedule: quarterly
autoupdate_commit_msg: "ci(pre-commit-optional): quarterly autoupdate"

repos:
- repo: https://github.com/tcort/markdown-link-check
rev: v3.12.2
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ repos:
args: [--line-length=100]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.6
rev: v19.1.5
hooks:
- id: clang-format
types_or: [c++, c, cuda]
Expand Down
22 changes: 22 additions & 0 deletions ansible/roles/artifacts/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,28 @@
mode: "644"
checksum: sha256:a2a91f5fe9c2e68e3e3647a272bb9bb25cd07631a1990a3fb15efddce7691131

# tensorrt_rtmdet
- name: Create tensorrt_rtmdet directory inside {{ data_dir }}
ansible.builtin.file:
path: "{{ data_dir }}/tensorrt_rtmdet"
mode: "755"
state: directory

- name: Download tensorrt_rtmdet_onnx_models.tar.gz
become: true
ansible.builtin.get_url:
url: https://autoware-files.s3.us-west-2.amazonaws.com/models/tensorrt_rtmdet_onnx_models.tar.gz
dest: "{{ data_dir }}/tensorrt_rtmdet/tensorrt_rtmdet_onnx_models.tar.gz"
mode: "644"
checksum: sha256:eaf6fe9caf1b4a0211dc3b0f4068b1fd6c1d35fe1582cc2aed95b8ed9468c598

- name: Extract tensorrt_rtmdet_onnx_models.tar.gz
ansible.builtin.unarchive:
src: "{{ data_dir }}/tensorrt_rtmdet/tensorrt_rtmdet_onnx_models.tar.gz"
dest: "{{ data_dir }}/tensorrt_rtmdet/"
extra_opts:
- --strip-components=1 # Removes the top-level folder during extraction

# traffic_light_classifier
- name: Create traffic_light_classifier directory inside {{ data_dir }}
ansible.builtin.file:
Expand Down
4 changes: 4 additions & 0 deletions autoware-nightly.repos
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ repositories:
type: git
url: https://github.com/autowarefoundation/autoware.universe.git
version: main
universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Migrate to AD API and remove this repository entry.
type: git
url: https://github.com/tier4/tier4_ad_api_adaptor.git
version: tier4/universe
launcher/autoware_launch:
type: git
url: https://github.com/autowarefoundation/autoware_launch.git
Expand Down
6 changes: 5 additions & 1 deletion autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories:
core/autoware_internal_msgs:
type: git
url: https://github.com/autowarefoundation/autoware_internal_msgs.git
version: 1.4.0
version: 1.5.0
core/autoware_cmake:
type: git
url: https://github.com/autowarefoundation/autoware_cmake.git
Expand Down Expand Up @@ -71,6 +71,10 @@ repositories:
type: git
url: https://github.com/tier4/glog.git
version: v0.6.0_t4-ros
universe/external/trt_batched_nms:
type: git
url: https://github.com/autowarefoundation/trt_batched_nms.git
version: main
# launcher
launcher/autoware_launch:
type: git
Expand Down
Loading

0 comments on commit 213f6a7

Please sign in to comment.