Skip to content

Commit

Permalink
feat: upstream to main (#148)
Browse files Browse the repository at this point in the history
* feat(docker): inherit `autoware-base`  images (autowarefoundation#5492)

* change run

Signed-off-by: Yutaka Kondo <[email protected]>

* use autoware-base images

Signed-off-by: Yutaka Kondo <[email protected]>

* update health-check

Signed-off-by: Yutaka Kondo <[email protected]>

* update load-env

Signed-off-by: Yutaka Kondo <[email protected]>

* update load-env

Signed-off-by: Yutaka Kondo <[email protected]>

* fix rebase

Signed-off-by: Yutaka Kondo <[email protected]>

* add build-args

Signed-off-by: Yutaka Kondo <[email protected]>

* fix hcl

Signed-off-by: Yutaka Kondo <[email protected]>

---------

Signed-off-by: Yutaka Kondo <[email protected]>

* chore(autoware.repos): fix `autoware.universe` and `autoware_launch` versions to `0.39.0` (autowarefoundation#5479)

* ci: update the pr template and add comment-on-pr workflow (autowarefoundation#5500)

Signed-off-by: M. Fatih Cırıt <[email protected]>

* ci(spell-check): switch the repository to autowarefoundation (autowarefoundation#5501)

Signed-off-by: M. Fatih Cırıt <[email protected]>

* ci(pre-commit-ansible): autoupdate (autowarefoundation#5217)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <[email protected]>

* ci(spell-check-diff): add explicit dict-packages (autowarefoundation#5503)

Signed-off-by: M. Fatih Cırıt <[email protected]>

* refactor(docker): fix `Dockerfile` indent (autowarefoundation#5495)

fix indent

Signed-off-by: Yutaka Kondo <[email protected]>

* feat(docker): update cleanup scripts (autowarefoundation#5497)

* update cleanup scripts

Signed-off-by: Yutaka Kondo <[email protected]>

* revert to ubuntu-22.04

Signed-off-by: Yutaka Kondo <[email protected]>

---------

Signed-off-by: Yutaka Kondo <[email protected]>

* ci(sync-files): make use of sync-files-templates repo (autowarefoundation#5504)

Signed-off-by: M. Fatih Cırıt <[email protected]>

---------

Signed-off-by: Yutaka Kondo <[email protected]>
Signed-off-by: M. Fatih Cırıt <[email protected]>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: M. Fatih Cırıt <[email protected]>
Co-authored-by: awf-autoware-bot[bot] <94889083+awf-autoware-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
4 people authored Nov 29, 2024
1 parent 44909ca commit 25fc81b
Show file tree
Hide file tree
Showing 23 changed files with 196 additions and 252 deletions.
8 changes: 0 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

44 changes: 0 additions & 44 deletions .github/PULL_REQUEST_TEMPLATE/small-change.md

This file was deleted.

63 changes: 0 additions & 63 deletions .github/PULL_REQUEST_TEMPLATE/standard-change.md

This file was deleted.

13 changes: 0 additions & 13 deletions .github/actions/docker-build-and-push-cuda/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,6 @@ runs:
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
shell: bash

- name: Docker meta for autoware:base-cuda
id: meta-base-cuda
uses: docker/metadata-action@v5
with:
images: ${{ github.repository_owner }}/${{ inputs.target-image }}
tags: |
type=raw,value=base-cuda-${{ inputs.platform }}
type=raw,value=base-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
bake-target: docker-metadata-action-base-cuda
flavor: |
latest=false
- name: Docker meta for autoware:universe-sensing-perception-devel-cuda
id: meta-universe-sensing-perception-devel-cuda
uses: docker/metadata-action@v5
Expand Down Expand Up @@ -139,7 +127,6 @@ runs:
push: true
files: |
docker/docker-bake-cuda.hcl
${{ steps.meta-base-cuda.outputs.bake-file }}
${{ steps.meta-universe-sensing-perception-devel-cuda.outputs.bake-file }}
${{ steps.meta-universe-sensing-perception-cuda.outputs.bake-file }}
${{ steps.meta-universe-devel-cuda.outputs.bake-file }}
Expand Down
13 changes: 0 additions & 13 deletions .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,6 @@ runs:
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
shell: bash

- name: Docker meta for autoware:base
id: meta-base
uses: docker/metadata-action@v5
with:
images: ${{ github.repository_owner }}/${{ inputs.target-image }}
tags: |
type=raw,value=base-${{ inputs.platform }}
type=raw,value=base-${{ steps.date.outputs.date }}-${{ inputs.platform }}
bake-target: docker-metadata-action-base
flavor: |
latest=false
- name: Docker meta for autoware:core-devel
id: meta-core-devel
uses: docker/metadata-action@v5
Expand Down Expand Up @@ -223,7 +211,6 @@ runs:
push: true
files: |
docker/docker-bake.hcl
${{ steps.meta-base.outputs.bake-file }}
${{ steps.meta-core-devel.outputs.bake-file }}
${{ steps.meta-universe-sensing-perception-devel.outputs.bake-file }}
${{ steps.meta-universe-sensing-perception.outputs.bake-file }}
Expand Down
23 changes: 23 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Description

## Related links

**Parent Issue:**

- Link

<!-- ⬇️🟢
**Private Links:**
- [CompanyName internal link]()
⬆️🟢 -->

## How was this PR tested?

## Notes for reviewers

None.

## Effects on system behavior

None.
64 changes: 64 additions & 0 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
- repository: autowarefoundation/sync-file-templates
files:
- source: sources/.github/ISSUE_TEMPLATE/bug.yaml
dest: .github/ISSUE_TEMPLATE/bug.yaml
- source: sources/.github/ISSUE_TEMPLATE/config.yml
dest: .github/ISSUE_TEMPLATE/config.yml
- source: sources/.github/ISSUE_TEMPLATE/task.yaml
dest: .github/ISSUE_TEMPLATE/task.yaml
- source: sources/.github/dependabot.yaml
dest: .github/dependabot.yaml
- source: sources/.github/pull_request_template.md
dest: .github/pull_request_template.md
- source: sources/.github/stale.yml
dest: .github/stale.yml
- source: sources/.github/workflows/cancel-previous-workflows.yaml
dest: .github/workflows/cancel-previous-workflows.yaml
- source: sources/.github/workflows/comment-on-pr.yaml
dest: .github/workflows/comment-on-pr.yaml
- source: sources/.github/workflows/github-release.yaml
dest: .github/workflows/github-release.yaml
- source: sources/.github/workflows/pre-commit-optional.yaml
dest: .github/workflows/pre-commit-optional.yaml
- source: sources/.github/workflows/pre-commit-optional-autoupdate.yaml
dest: .github/workflows/pre-commit-optional-autoupdate.yaml
- source: sources/.github/workflows/pre-commit-autoupdate.yaml
dest: .github/workflows/pre-commit-autoupdate.yaml
- source: sources/.github/workflows/semantic-pull-request.yaml
dest: .github/workflows/semantic-pull-request.yaml
- source: sources/.github/workflows/spell-check-differential.yaml
dest: .github/workflows/spell-check-differential.yaml
- source: sources/.github/workflows/spell-check-daily.yaml
dest: .github/workflows/spell-check-daily.yaml
- source: sources/.github/workflows/sync-files.yaml
dest: .github/workflows/sync-files.yaml
- source: sources/.clang-format
dest: .clang-format
- source: sources/.clang-tidy
dest: .clang-tidy
- source: sources/.markdown-link-check.json
dest: .markdown-link-check.json
- source: sources/.markdownlint.yaml
dest: .markdownlint.yaml
- source: sources/.pre-commit-config-optional.yaml
dest: .pre-commit-config-optional.yaml
- source: sources/.pre-commit-config.yaml
dest: .pre-commit-config.yaml
- source: sources/.prettierignore
dest: .prettierignore
- source: sources/.prettierrc.yaml
dest: .prettierrc.yaml
- source: sources/.yamllint.yaml
dest: .yamllint.yaml
- source: sources/CODE_OF_CONDUCT.md
dest: CODE_OF_CONDUCT.md
- source: sources/CONTRIBUTING.md
dest: CONTRIBUTING.md
- source: sources/CPPLINT.cfg
dest: CPPLINT.cfg
- source: sources/DISCLAIMER.md
dest: DISCLAIMER.md
- source: sources/LICENSE
dest: LICENSE
- source: sources/setup.cfg
dest: setup.cfg
25 changes: 25 additions & 0 deletions .github/workflows/comment-on-pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: comment-on-pr
on:
pull_request_target:

jobs:
comment-on-pr:
runs-on: ubuntu-22.04
permissions:
pull-requests: write
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Initial PR comment
uses: marocchino/sticky-pull-request-comment@v2
with:
message: |
Thank you for contributing to the Autoware project!
🚧 If your pull request is in progress, [switch it to draft mode](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft).
Please ensure:
- You've checked our [contribution guidelines](https://autowarefoundation.github.io/autoware-documentation/main/contributing/).
- Your PR follows our [pull request guidelines](https://autowarefoundation.github.io/autoware-documentation/main/contributing/pull-request-guidelines/).
- All required CI checks pass before [marking the PR ready for review](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review).
4 changes: 4 additions & 0 deletions .github/workflows/docker-build-and-push-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
*.platform=linux/arm64
*.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
*.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
*.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
*.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
*.args.LIB_DIR=aarch64
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
Expand Down Expand Up @@ -110,6 +112,8 @@ jobs:
*.platform=linux/arm64
*.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
*.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
*.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
*.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
*.args.LIB_DIR=aarch64
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docker-build-and-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
*.platform=linux/amd64
*.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
*.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
*.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
*.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
*.args.LIB_DIR=x86_64
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-main
Expand Down Expand Up @@ -110,6 +112,8 @@ jobs:
*.platform=linux/amd64
*.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
*.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
*.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
*.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
*.args.LIB_DIR=x86_64
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
*.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-main
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/health-check-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
build-args: |
ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
LIB_DIR=aarch64
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/health-check-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:
build-args: |
ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
LIB_DIR=x86_64
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/health-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ jobs:
build-args: |
ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
LIB_DIR=x86_64
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/load-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@ name: load-env
on:
workflow_call:
outputs:
base_image:
value: ${{ jobs.load-env.outputs.base_image }}
rosdistro:
value: ${{ jobs.load-env.outputs.rosdistro }}
base_image:
value: ${{ jobs.load-env.outputs.base_image }}
autoware_base_image:
value: ${{ jobs.load-env.outputs.autoware_base_image }}
autoware_base_cuda_image:
value: ${{ jobs.load-env.outputs.autoware_base_cuda_image }}

jobs:
load-env:
runs-on: ubuntu-22.04
outputs:
base_image: ${{ steps.set-env.outputs.base_image }}
rosdistro: ${{ steps.set-env.outputs.rosdistro }}
base_image: ${{ steps.set-env.outputs.base_image }}
autoware_base_image: ${{ steps.set-env.outputs.autoware_base_image }}
autoware_base_cuda_image: ${{ steps.set-env.outputs.autoware_base_cuda_image }}
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand All @@ -28,5 +34,7 @@ jobs:
- name: Set env
id: set-env
run: |
echo "base_image=${{ env.base_image }}" >> $GITHUB_OUTPUT
echo "rosdistro=${{ env.rosdistro }}" >> $GITHUB_OUTPUT
echo "base_image=${{ env.base_image }}" >> $GITHUB_OUTPUT
echo "autoware_base_image=${{ env.autoware_base_image }}" >> $GITHUB_OUTPUT
echo "autoware_base_cuda_image=${{ env.autoware_base_cuda_image }}" >> $GITHUB_OUTPUT
5 changes: 4 additions & 1 deletion .github/workflows/spell-check-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ jobs:
- name: Run spell-check
uses: autowarefoundation/autoware-github-actions/spell-check@v1
with:
cspell-json-url: https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/.cspell.json
cspell-json-url: https://raw.githubusercontent.com/autowarefoundation/autoware-spell-check-dict/main/.cspell.json
dict-packages: |
https://github.com/autowarefoundation/autoware-spell-check-dict
https://github.com/tier4/cspell-dicts
Loading

0 comments on commit 25fc81b

Please sign in to comment.