From 4148d655b4709b0e062a4f68fa01bb716d3b1112 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 27 Nov 2024 18:22:54 +0900 Subject: [PATCH 1/9] feat(docker): inherit `autoware-base` images (#5492) * change run Signed-off-by: Yutaka Kondo * use autoware-base images Signed-off-by: Yutaka Kondo * update health-check Signed-off-by: Yutaka Kondo * update load-env Signed-off-by: Yutaka Kondo * update load-env Signed-off-by: Yutaka Kondo * fix rebase Signed-off-by: Yutaka Kondo * add build-args Signed-off-by: Yutaka Kondo * fix hcl Signed-off-by: Yutaka Kondo --------- Signed-off-by: Yutaka Kondo --- .../docker-build-and-push-cuda/action.yaml | 13 ---- .../actions/docker-build-and-push/action.yaml | 13 ---- .../docker-build-and-push-arm64.yaml | 4 + .github/workflows/docker-build-and-push.yaml | 4 + .github/workflows/health-check-arm64.yaml | 2 + .github/workflows/health-check-nightly.yaml | 2 + .github/workflows/health-check.yaml | 2 + .github/workflows/load-env.yaml | 16 +++- amd64.env | 2 + docker/Dockerfile | 74 +++++-------------- docker/docker-bake-cuda.hcl | 8 -- docker/docker-bake.hcl | 8 -- 12 files changed, 46 insertions(+), 102 deletions(-) diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml index fc28683d892..bf9d9ca0854 100644 --- a/.github/actions/docker-build-and-push-cuda/action.yaml +++ b/.github/actions/docker-build-and-push-cuda/action.yaml @@ -64,18 +64,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: ghcr.io/${{ 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 @@ -137,7 +125,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 }} diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index 3e3bc857fea..c028eede588 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -64,18 +64,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: ghcr.io/${{ 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 @@ -221,7 +209,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 }} diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index afdeabd76ea..ee50b263616 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -56,6 +56,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=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main @@ -106,6 +108,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=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml index d36b24cf98e..4fbcb666b0f 100644 --- a/.github/workflows/docker-build-and-push.yaml +++ b/.github/workflows/docker-build-and-push.yaml @@ -51,6 +51,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=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-main @@ -101,6 +103,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=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }} *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-main diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml index d487e3c6ffd..9508abc3b1c 100644 --- a/.github/workflows/health-check-arm64.yaml +++ b/.github/workflows/health-check-arm64.yaml @@ -37,6 +37,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 - name: Show disk space diff --git a/.github/workflows/health-check-nightly.yaml b/.github/workflows/health-check-nightly.yaml index f38836e5d1b..d3e3ee74c7a 100644 --- a/.github/workflows/health-check-nightly.yaml +++ b/.github/workflows/health-check-nightly.yaml @@ -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 - name: Show disk space diff --git a/.github/workflows/health-check.yaml b/.github/workflows/health-check.yaml index 55894881a4d..c51d8a320e4 100644 --- a/.github/workflows/health-check.yaml +++ b/.github/workflows/health-check.yaml @@ -49,6 +49,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 - name: Show disk space diff --git a/.github/workflows/load-env.yaml b/.github/workflows/load-env.yaml index ff7f24b6887..48af4b3a145 100644 --- a/.github/workflows/load-env.yaml +++ b/.github/workflows/load-env.yaml @@ -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 @@ -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 diff --git a/amd64.env b/amd64.env index 38eadee0a91..f1a068d50b7 100644 --- a/amd64.env +++ b/amd64.env @@ -1,6 +1,8 @@ rosdistro=humble rmw_implementation=rmw_cyclonedds_cpp base_image=ros:humble-ros-base-jammy +autoware_base_image=ghcr.io/autowarefoundation/autoware-base:latest +autoware_base_cuda_image=ghcr.io/autowarefoundation/autoware-base:cuda-latest cuda_version=12.3 cudnn_version=8.9.5.29-1+cuda12.2 tensorrt_version=8.6.1.6-1+cuda12.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 8a82503b6dd..d2ba84d017c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,52 +1,6 @@ ARG BASE_IMAGE - -# hadolint ignore=DL3006 -FROM $BASE_IMAGE AS base -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -ARG ROS_DISTRO - -# Copy files -COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env /autoware/ -COPY ansible/ /autoware/ansible/ -COPY docker/scripts/cleanup_apt.sh /autoware/cleanup_apt.sh -RUN chmod +x /autoware/cleanup_apt.sh -COPY docker/scripts/cleanup_system.sh /autoware/cleanup_system.sh -RUN chmod +x /autoware/cleanup_system.sh -WORKDIR /autoware - -# Install apt packages and add GitHub to known hosts for private repositories -RUN rm -f /etc/apt/apt.conf.d/docker-clean \ - && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ - gosu \ - ssh \ - && /autoware/cleanup_apt.sh \ - && mkdir -p ~/.ssh \ - && ssh-keyscan github.com >> ~/.ssh/known_hosts - -# Set up base environment -RUN --mount=type=ssh \ - --mount=type=cache,target=/var/cache/apt,sharing=locked \ - ./setup-dev-env.sh -y --module base --no-nvidia --no-cuda-drivers --runtime openadkit \ - && pip uninstall -y ansible ansible-core \ - && /autoware/cleanup_apt.sh \ - && echo "source /opt/ros/${ROS_DISTRO}/setup.bash" > /etc/bash.bashrc - -# Create entrypoint -COPY docker/etc/ros_entrypoint.sh /ros_entrypoint.sh -RUN chmod +x /ros_entrypoint.sh -CMD ["/bin/bash"] - -FROM base AS base-cuda -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -# Set up CUDA runtime environment and artifacts -# hadolint ignore=SC2002 -RUN --mount=type=ssh \ - ./setup-dev-env.sh -y --module base --download-artifacts --no-cuda-drivers --runtime openadkit \ - && pip uninstall -y ansible ansible-core \ - && /autoware/cleanup_apt.sh true +ARG AUTOWARE_BASE_IMAGE +ARG AUTOWARE_BASE_CUDA_IMAGE # hadolint ignore=DL3006 FROM $BASE_IMAGE AS rosdep-depend @@ -158,7 +112,8 @@ RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ > /rosdep-exec-depend-packages.txt \ && cat /rosdep-exec-depend-packages.txt -FROM base AS core-devel +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS core-devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ENV CCACHE_DIR="/root/.ccache" @@ -413,7 +368,8 @@ COPY --from=universe-devel /opt/autoware /opt/autoware ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS universe-sensing-perception +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS universe-sensing-perception SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -438,7 +394,8 @@ RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base-cuda AS universe-sensing-perception-cuda +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_CUDA_IMAGE AS universe-sensing-perception-cuda SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -459,7 +416,8 @@ COPY --from=universe-sensing-perception-devel-cuda /opt/autoware /opt/autoware ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS universe-localization-mapping +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS universe-localization-mapping SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -484,7 +442,8 @@ RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS universe-planning-control +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS universe-planning-control SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -509,7 +468,8 @@ RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS universe-vehicle-system +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS universe-vehicle-system SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -534,7 +494,8 @@ RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS universe +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_IMAGE AS universe SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -559,7 +520,8 @@ RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base-cuda AS universe-cuda +# hadolint ignore=DL3006 +FROM $AUTOWARE_BASE_CUDA_IMAGE AS universe-cuda SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR diff --git a/docker/docker-bake-cuda.hcl b/docker/docker-bake-cuda.hcl index 44ec1142178..87aa27df879 100644 --- a/docker/docker-bake-cuda.hcl +++ b/docker/docker-bake-cuda.hcl @@ -1,6 +1,5 @@ group "default" { targets = [ - "base-cuda", "universe-sensing-perception-devel-cuda", "universe-sensing-perception-cuda", "universe-devel-cuda", @@ -9,18 +8,11 @@ group "default" { } // For docker/metadata-action -target "docker-metadata-action-base-cuda" {} target "docker-metadata-action-universe-sensing-perception-devel-cuda" {} target "docker-metadata-action-universe-sensing-perception-cuda" {} target "docker-metadata-action-universe-devel-cuda" {} target "docker-metadata-action-universe-cuda" {} -target "base-cuda" { - inherits = ["docker-metadata-action-base-cuda"] - dockerfile = "docker/Dockerfile" - target = "base-cuda" -} - target "universe-sensing-perception-devel-cuda" { inherits = ["docker-metadata-action-universe-sensing-perception-devel-cuda"] dockerfile = "docker/Dockerfile" diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl index 35d0f7fdbfc..dcf79ffc115 100644 --- a/docker/docker-bake.hcl +++ b/docker/docker-bake.hcl @@ -1,6 +1,5 @@ group "default" { targets = [ - "base", "core-devel", "universe-sensing-perception-devel", "universe-sensing-perception", @@ -16,7 +15,6 @@ group "default" { } // For docker/metadata-action -target "docker-metadata-action-base" {} target "docker-metadata-action-core-devel" {} target "docker-metadata-action-universe-sensing-perception-devel" {} target "docker-metadata-action-universe-sensing-perception" {} @@ -29,12 +27,6 @@ target "docker-metadata-action-universe-vehicle-system" {} target "docker-metadata-action-universe-devel" {} target "docker-metadata-action-universe" {} -target "base" { - inherits = ["docker-metadata-action-base"] - dockerfile = "docker/Dockerfile" - target = "base" -} - target "core-devel" { inherits = ["docker-metadata-action-core-devel"] dockerfile = "docker/Dockerfile" From 45ceb15b8e9c80880a04b9d99c1b7b85800f87d7 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Wed, 27 Nov 2024 20:14:51 +0900 Subject: [PATCH 2/9] chore(autoware.repos): fix `autoware.universe` and `autoware_launch` versions to `0.39.0` (#5479) --- autoware.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoware.repos b/autoware.repos index cbe72148e27..c7e85183ed4 100644 --- a/autoware.repos +++ b/autoware.repos @@ -38,7 +38,7 @@ repositories: universe/autoware.universe: type: git url: https://github.com/autowarefoundation/autoware.universe.git - version: main + version: 0.39.0 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 @@ -80,7 +80,7 @@ repositories: launcher/autoware_launch: type: git url: https://github.com/autowarefoundation/autoware_launch.git - version: main + version: 0.39.0 # sensor_component sensor_component/external/sensor_component_description: type: git From b2f5c079cf13ae6a95322a33639f1a6ebd331327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Thu, 28 Nov 2024 02:45:57 +0300 Subject: [PATCH 3/9] ci: update the pr template and add comment-on-pr workflow (#5500) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/PULL_REQUEST_TEMPLATE.md | 8 --- .github/PULL_REQUEST_TEMPLATE/small-change.md | 44 ------------- .../PULL_REQUEST_TEMPLATE/standard-change.md | 63 ------------------- .github/pull_request_template.md | 23 +++++++ .github/workflows/comment-on-pr.yaml | 25 ++++++++ 5 files changed, 48 insertions(+), 115 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE/small-change.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE/standard-change.md create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/comment-on-pr.yaml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 97b0e954524..00000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,8 +0,0 @@ -**Note**: Confirm the [contribution guidelines](https://autowarefoundation.github.io/autoware-documentation/main/contributing/) before submitting a pull request. - -Click the `Preview` tab and select a PR template: - -- [Standard change](?expand=1&template=standard-change.md) -- [Small change](?expand=1&template=small-change.md) - -**Do NOT send a PR with this description.** diff --git a/.github/PULL_REQUEST_TEMPLATE/small-change.md b/.github/PULL_REQUEST_TEMPLATE/small-change.md deleted file mode 100644 index e15fdd992d1..00000000000 --- a/.github/PULL_REQUEST_TEMPLATE/small-change.md +++ /dev/null @@ -1,44 +0,0 @@ -## Description - - - -## Tests performed - - - - -Not applicable. - -## Effects on system behavior - - - -Not applicable. - -## Interface changes - - - -## Pre-review checklist for the PR author - -The PR author **must** check the checkboxes below when creating the PR. - -- [ ] I've confirmed the [contribution guidelines]. -- [ ] The PR follows the [pull request guidelines]. - -## In-review checklist for the PR reviewers - -The PR reviewers **must** check the checkboxes below before approval. - -- [ ] The PR follows the [pull request guidelines]. - -## Post-review checklist for the PR author - -The PR author **must** check the checkboxes below before merging. - -- [ ] There are no open discussions or they are tracked via tickets. - -After all checkboxes are checked, anyone who has write access can merge the PR. - -[contribution guidelines]: https://autowarefoundation.github.io/autoware-documentation/main/contributing/ -[pull request guidelines]: https://autowarefoundation.github.io/autoware-documentation/main/contributing/pull-request-guidelines/ diff --git a/.github/PULL_REQUEST_TEMPLATE/standard-change.md b/.github/PULL_REQUEST_TEMPLATE/standard-change.md deleted file mode 100644 index 391af629751..00000000000 --- a/.github/PULL_REQUEST_TEMPLATE/standard-change.md +++ /dev/null @@ -1,63 +0,0 @@ -## Description - - - -## Related links - - - -## Tests performed - - - -## Notes for reviewers - - - -## Interface changes - - - -### ROS Topic Changes - - - - - - -### ROS Parameter Changes - - - - - -## Effects on system behavior - - - -## Pre-review checklist for the PR author - -The PR author **must** check the checkboxes below when creating the PR. - -- [ ] I've confirmed the [contribution guidelines]. -- [ ] The PR follows the [pull request guidelines]. - -## In-review checklist for the PR reviewers - -The PR reviewers **must** check the checkboxes below before approval. - -- [ ] The PR follows the [pull request guidelines]. -- [ ] The PR has been properly tested. -- [ ] The PR has been reviewed by the code owners. - -## Post-review checklist for the PR author - -The PR author **must** check the checkboxes below before merging. - -- [ ] There are no open discussions or they are tracked via tickets. -- [ ] The PR is ready for merge. - -After all checkboxes are checked, anyone who has write access can merge the PR. - -[contribution guidelines]: https://autowarefoundation.github.io/autoware-documentation/main/contributing/ -[pull request guidelines]: https://autowarefoundation.github.io/autoware-documentation/main/contributing/pull-request-guidelines/ diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000000..a391e265016 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,23 @@ +## Description + +## Related links + +**Parent Issue:** + +- Link + + + +## How was this PR tested? + +## Notes for reviewers + +None. + +## Effects on system behavior + +None. diff --git a/.github/workflows/comment-on-pr.yaml b/.github/workflows/comment-on-pr.yaml new file mode 100644 index 00000000000..c80141ddac6 --- /dev/null +++ b/.github/workflows/comment-on-pr.yaml @@ -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). From fdfd0a914afde4cb685fc64c33403f0cd3bacece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Thu, 28 Nov 2024 13:45:49 +0300 Subject: [PATCH 4/9] ci(spell-check): switch the repository to autowarefoundation (#5501) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/workflows/spell-check-differential.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spell-check-differential.yaml b/.github/workflows/spell-check-differential.yaml index f030a45251d..fdf819b035d 100644 --- a/.github/workflows/spell-check-differential.yaml +++ b/.github/workflows/spell-check-differential.yaml @@ -13,4 +13,4 @@ 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 From f88d9f8a6b69ecb82126433ed4f568d16cbf2c3a Mon Sep 17 00:00:00 2001 From: "awf-autoware-bot[bot]" <94889083+awf-autoware-bot[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 14:09:23 +0300 Subject: [PATCH 5/9] ci(pre-commit-ansible): autoupdate (#5217) Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions --- .pre-commit-config-ansible.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config-ansible.yaml b/.pre-commit-config-ansible.yaml index 4b8210eb003..161ab4efada 100644 --- a/.pre-commit-config-ansible.yaml +++ b/.pre-commit-config-ansible.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/ansible/ansible-lint.git - rev: v24.7.0 + rev: v24.10.0 hooks: - id: ansible-lint additional_dependencies: From 897faafbb11ff1f0f8a6e5bc4b1d1c5c39057661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Thu, 28 Nov 2024 15:01:14 +0300 Subject: [PATCH 6/9] ci(spell-check-diff): add explicit dict-packages (#5503) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/workflows/spell-check-differential.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/spell-check-differential.yaml b/.github/workflows/spell-check-differential.yaml index fdf819b035d..90d59626723 100644 --- a/.github/workflows/spell-check-differential.yaml +++ b/.github/workflows/spell-check-differential.yaml @@ -14,3 +14,6 @@ jobs: uses: autowarefoundation/autoware-github-actions/spell-check@v1 with: 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 From 24908996a5bae524bf9eff9c6f7fa24c5915301b Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Thu, 28 Nov 2024 21:31:35 +0900 Subject: [PATCH 7/9] refactor(docker): fix `Dockerfile` indent (#5495) fix indent Signed-off-by: Yutaka Kondo --- docker/Dockerfile | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d2ba84d017c..8857e43bc9e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,14 +26,14 @@ RUN --mount=type=ssh \ # Generate install package lists COPY src/core /autoware/src/core RUN rosdep update && /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-core-depend-packages.txt \ - && cat /rosdep-core-depend-packages.txt + > /rosdep-core-depend-packages.txt \ + && cat /rosdep-core-depend-packages.txt COPY src/universe/external /autoware/src/universe/external COPY src/universe/autoware.universe/common /autoware/src/universe/autoware.universe/common RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-common-depend-packages.txt \ - && cat /rosdep-universe-common-depend-packages.txt + > /rosdep-universe-common-depend-packages.txt \ + && cat /rosdep-universe-common-depend-packages.txt FROM rosdep-depend AS rosdep-universe-sensing-perception-depend SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -42,11 +42,11 @@ ARG ROS_DISTRO COPY src/universe/autoware.universe/perception /autoware/src/universe/autoware.universe/perception COPY src/universe/autoware.universe/sensing /autoware/src/universe/autoware.universe/sensing RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-sensing-perception-depend-packages.txt \ - && cat /rosdep-universe-sensing-perception-depend-packages.txt + > /rosdep-universe-sensing-perception-depend-packages.txt \ + && cat /rosdep-universe-sensing-perception-depend-packages.txt RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-sensing-perception-exec-depend-packages.txt \ - && cat /rosdep-universe-sensing-perception-exec-depend-packages.txt + > /rosdep-universe-sensing-perception-exec-depend-packages.txt \ + && cat /rosdep-universe-sensing-perception-exec-depend-packages.txt FROM rosdep-depend AS rosdep-universe-localization-mapping-depend SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -55,11 +55,11 @@ ARG ROS_DISTRO COPY src/universe/autoware.universe/localization /autoware/src/universe/autoware.universe/localization COPY src/universe/autoware.universe/map /autoware/src/universe/autoware.universe/map RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-localization-mapping-depend-packages.txt \ - && cat /rosdep-universe-localization-mapping-depend-packages.txt + > /rosdep-universe-localization-mapping-depend-packages.txt \ + && cat /rosdep-universe-localization-mapping-depend-packages.txt RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-localization-mapping-exec-depend-packages.txt \ - && cat /rosdep-universe-localization-mapping-exec-depend-packages.txt + > /rosdep-universe-localization-mapping-exec-depend-packages.txt \ + && cat /rosdep-universe-localization-mapping-exec-depend-packages.txt FROM rosdep-depend AS rosdep-universe-planning-control-depend SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -73,11 +73,11 @@ COPY src/universe/autoware.universe/map/autoware_map_projection_loader /autoware COPY src/universe/autoware.universe/sensing/autoware_pcl_extensions /autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions COPY src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor /autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-planning-control-depend-packages.txt \ - && cat /rosdep-universe-planning-control-depend-packages.txt + > /rosdep-universe-planning-control-depend-packages.txt \ + && cat /rosdep-universe-planning-control-depend-packages.txt RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-planning-control-exec-depend-packages.txt \ - && cat /rosdep-universe-planning-control-exec-depend-packages.txt + > /rosdep-universe-planning-control-exec-depend-packages.txt \ + && cat /rosdep-universe-planning-control-exec-depend-packages.txt FROM rosdep-depend AS rosdep-universe-vehicle-system-depend SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -88,11 +88,11 @@ COPY src/universe/autoware.universe/system /autoware/src/universe/autoware.unive COPY src/universe/autoware.universe/map/autoware_map_height_fitter /autoware/src/universe/autoware.universe/map/autoware_map_height_fitter COPY src/universe/autoware.universe/localization/autoware_pose2twist /autoware/src/universe/autoware.universe/localization/autoware_pose2twist RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-vehicle-system-depend-packages.txt \ - && cat /rosdep-universe-vehicle-system-depend-packages.txt + > /rosdep-universe-vehicle-system-depend-packages.txt \ + && cat /rosdep-universe-vehicle-system-depend-packages.txt RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-vehicle-system-exec-depend-packages.txt \ - && cat /rosdep-universe-vehicle-system-exec-depend-packages.txt + > /rosdep-universe-vehicle-system-exec-depend-packages.txt \ + && cat /rosdep-universe-vehicle-system-exec-depend-packages.txt FROM rosdep-depend AS rosdep-universe-depend SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -105,12 +105,12 @@ COPY src/sensor_kit /autoware/src/sensor_kit COPY src/universe /autoware/src/universe COPY src/vehicle /autoware/src/vehicle RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-universe-depend-packages.txt \ - && cat /rosdep-universe-depend-packages.txt + > /rosdep-universe-depend-packages.txt \ + && cat /rosdep-universe-depend-packages.txt RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ - > /rosdep-exec-depend-packages.txt \ - && cat /rosdep-exec-depend-packages.txt + > /rosdep-exec-depend-packages.txt \ + && cat /rosdep-exec-depend-packages.txt # hadolint ignore=DL3006 FROM $AUTOWARE_BASE_IMAGE AS core-devel From 09049a513963926f9dab533a07f892ebac7161cc Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Thu, 28 Nov 2024 21:45:08 +0900 Subject: [PATCH 8/9] feat(docker): update cleanup scripts (#5497) * update cleanup scripts Signed-off-by: Yutaka Kondo * revert to ubuntu-22.04 Signed-off-by: Yutaka Kondo --------- Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push.yaml | 2 +- docker/scripts/cleanup_apt.sh | 8 ++++---- docker/scripts/cleanup_system.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml index 4fbcb666b0f..292b4753b51 100644 --- a/.github/workflows/docker-build-and-push.yaml +++ b/.github/workflows/docker-build-and-push.yaml @@ -65,7 +65,7 @@ jobs: docker-build-and-push-cuda: needs: [load-env, docker-build-and-push] - runs-on: codebuild-autoware-us-east-1-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-large + runs-on: ubuntu-22.04 steps: - name: Check out repository uses: actions/checkout@v4 diff --git a/docker/scripts/cleanup_apt.sh b/docker/scripts/cleanup_apt.sh index 0b0d43fea14..ad03c1f39e3 100755 --- a/docker/scripts/cleanup_apt.sh +++ b/docker/scripts/cleanup_apt.sh @@ -1,10 +1,10 @@ #!/bin/bash function cleanup_apt() { - local remove_var_lib_apt_lists=$1 - apt-get autoremove -y && rm -rf "$HOME"/.cache - if [[ $remove_var_lib_apt_lists == true ]]; then - rm -rf /var/lib/apt/lists/* + local apt_clean=$1 + apt-get autoremove -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache + if [[ $apt_clean == true ]]; then + apt-get clean fi } diff --git a/docker/scripts/cleanup_system.sh b/docker/scripts/cleanup_system.sh index 1e8d911becc..0833be2b3a4 100755 --- a/docker/scripts/cleanup_system.sh +++ b/docker/scripts/cleanup_system.sh @@ -4,15 +4,15 @@ function cleanup_system() { local lib_dir=$1 local ros_distro=$2 - apt-get autoremove -y && rm -rf "$HOME"/.cache && - find /usr/lib/"$lib_dir"-linux-gnu -name "*.a" -type f -delete && + find /usr/lib/"$lib_dir"-linux-gnu -name "*.a" -type f -delete && find / -name "*.o" -type f -delete && find / -name "*.h" -type f -delete && find / -name "*.hpp" -type f -delete && rm -rf /autoware/ansible /autoware/ansible-galaxy-requirements.yaml /autoware/setup-dev-env.sh /autoware/*.env \ - /root/.local/pipx /opt/ros/"$ros_distro"/include /etc/apt/sources.list.d/cuda*.list \ + /root/.local/pipx /opt/ros/"$ros_distro"/include /opt/autoware/include /etc/apt/sources.list.d/cuda*.list \ /etc/apt/sources.list.d/docker.list /etc/apt/sources.list.d/nvidia-docker.list \ /usr/include /usr/share/doc /usr/lib/gcc /usr/lib/jvm /usr/lib/llvm* } +./cleanup_apt.sh cleanup_system "$@" From 3054252d4f082165499c2cf2b61b81ecb5691c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Fri, 29 Nov 2024 05:34:00 +0300 Subject: [PATCH 9/9] ci(sync-files): make use of sync-files-templates repo (#5504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt --- .github/sync-files.yaml | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/.github/sync-files.yaml b/.github/sync-files.yaml index e69de29bb2d..aa720753cbf 100644 --- a/.github/sync-files.yaml +++ b/.github/sync-files.yaml @@ -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