Skip to content

Commit

Permalink
Merge pull request #163 from youtalk/upstream-to-main
Browse files Browse the repository at this point in the history
feat: upstream to main
  • Loading branch information
youtalk authored Jan 23, 2025
2 parents 7c0b3b4 + 287d615 commit af3fc22
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 24 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 @@ -190,6 +190,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: ${{ 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: ${{ 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 @@ -231,6 +257,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
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.13.6
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
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

0 comments on commit af3fc22

Please sign in to comment.