From d6db15aa2b3d8efcc7eda7103f08ae7d46289ebc Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:11:08 +0900 Subject: [PATCH] feat: update repos file and workflow (#5) Signed-off-by: Takagi, Isamu --- .github/workflows/build-main-self-hosted.yaml | 47 -------------- ...ocker-build-and-push-main-self-hosted.yaml | 64 ------------------- .../workflows/docker-build-and-push-main.yaml | 9 --- autoware.repos | 31 --------- docker/build.sh | 4 +- 5 files changed, 2 insertions(+), 153 deletions(-) delete mode 100644 .github/workflows/build-main-self-hosted.yaml delete mode 100644 .github/workflows/docker-build-and-push-main-self-hosted.yaml diff --git a/.github/workflows/build-main-self-hosted.yaml b/.github/workflows/build-main-self-hosted.yaml deleted file mode 100644 index 3f0fdb23b13..00000000000 --- a/.github/workflows/build-main-self-hosted.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: build-main-self-hosted - -on: - schedule: - - cron: 0 12 * * * - workflow_dispatch: - -jobs: - load-env: - uses: ./.github/workflows/load-env.yaml - - build-main-self-hosted: - needs: load-env - runs-on: [self-hosted, linux, ARM64] - container: ${{ needs.load-env.outputs.base-image }} - steps: - - name: Check out repository - uses: actions/checkout@v3 - - - name: Run setup script - run: | - ./setup-dev-env.sh -y - - - name: Set git config - uses: autowarefoundation/autoware-github-actions/set-git-config@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Run vcs import - run: | - mkdir src - vcs import src < autoware.repos - - - name: Run vcs export - run: | - vcs export --exact src || true - - - name: Run rosdep install - run: | - sudo apt-get -y update - rosdep update - DEBIAN_FRONTEND=noninteractive rosdep install -y --from-paths src --ignore-src --rosdistro ${{ needs.load-env.outputs.rosdistro }} - - - name: Build - run: | - . /opt/ros/${{ needs.load-env.outputs.rosdistro }}/setup.sh - colcon build --event-handlers console_cohesion+ --cmake-args -DCMAKE_BUILD_TYPE=Release diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml deleted file mode 100644 index e2c435fc0ee..00000000000 --- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: docker-build-and-push-main-self-hosted - -on: - push: - tags: - - v* - - "[0-9]+.[0-9]+*" - schedule: - - cron: 0 0 1,15 * * - workflow_dispatch: - -jobs: - docker-build-and-push-main-self-hosted: - runs-on: [self-hosted, linux, ARM64] - strategy: - fail-fast: false - matrix: - name: - - no-cuda - - cuda - include: - - name: no-cuda - base_image_env: base_image - setup-args: --no-nvidia - additional-tag-suffix: "" - - name: cuda - base_image_env: cuda_base_image - setup-args: --no-cuda-drivers - additional-tag-suffix: -cuda - steps: - # https://github.com/actions/checkout/issues/211 - - name: Change permission of workspace - run: | - sudo chown -R $USER:$USER ${{ github.workspace }} - - - name: Check out repository - uses: actions/checkout@v3 - - - name: Free disk space - uses: ./.github/actions/free-disk-space - - - name: Load env - run: | - cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV - if [ "$(uname -m)" = "aarch64" ]; then - cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV - fi - - - name: Build 'autoware-universe' - uses: ./.github/actions/docker-build-and-push - with: - bake-target: autoware-universe - build-args: | - *.platform=linux/arm64 - *.args.ROS_DISTRO=${{ env.rosdistro }} - *.args.BASE_IMAGE=${{ env[format('{0}', matrix.base_image_env)] }} - *.args.PREBUILT_BASE_IMAGE=${{ env.prebuilt_base_image }} - *.args.SETUP_ARGS=${{ matrix.setup-args }} - tag-prefix: ${{ env.rosdistro }}- - tag-suffix: ${{ matrix.additional-tag-suffix }}-arm64 - - - name: Show disk space - run: | - df -h diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml index 6f71ac71560..0dc3df7f6af 100644 --- a/.github/workflows/docker-build-and-push-main.yaml +++ b/.github/workflows/docker-build-and-push-main.yaml @@ -1,10 +1,6 @@ name: docker-build-and-push-main on: - push: - tags: - - v* - - "[0-9]+.[0-9]+*" schedule: - cron: 0 0 1,15 * * workflow_dispatch: @@ -17,16 +13,11 @@ jobs: matrix: name: - no-cuda - - cuda include: - name: no-cuda base_image_env: base_image setup-args: --no-nvidia additional-tag-suffix: "" - - name: cuda - base_image_env: cuda_base_image - setup-args: --no-cuda-drivers - additional-tag-suffix: -cuda steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/autoware.repos b/autoware.repos index bf1a1c14b43..d67fb0c3415 100644 --- a/autoware.repos +++ b/autoware.repos @@ -54,37 +54,6 @@ repositories: type: git url: https://github.com/autowarefoundation/autoware_launch.git version: awsim-stable - # sensor_component - sensor_component/external/sensor_component_description: - type: git - url: https://github.com/tier4/sensor_component_description.git - version: 475857daeb4c4883ab0295336713364b326e8278 - sensor_component/external/tamagawa_imu_driver: - type: git - url: https://github.com/tier4/tamagawa_imu_driver.git - version: de4bf6be79aa2968cf2f62e0ebe1ff8a5797e6ad - sensor_component/external/velodyne_vls: - type: git - url: https://github.com/tier4/velodyne_vls.git - version: 55dffdf3b3ef889e149977dc6ab1da124b5176c9 - # sensor_kit - sensor_kit/sample_sensor_kit_launch: - type: git - url: https://github.com/autowarefoundation/sample_sensor_kit_launch.git - version: 06330e6b07449a3609ced295c0a9ce6a1805ef99 - sensor_kit/external/awsim_sensor_kit_launch: # TODO: Integrate into sample_sensor_kit_launch - type: git - url: https://github.com/RobotecAI/awsim_sensor_kit_launch.git - version: a1f5993407ffeb4abcf97a49cd1b4034768d97b4 - # vehicle - vehicle/sample_vehicle_launch: - type: git - url: https://github.com/autowarefoundation/sample_vehicle_launch.git - version: 157238ca77de7b0a59f71a0b28f456741fab3ca2 - vehicle/external/pacmod_interface: - type: git - url: https://github.com/tier4/pacmod_interface.git - version: 3db50a2abc68576308289cc84d83d14376144d64 # param param/autoware_individual_params: type: git diff --git a/docker/build.sh b/docker/build.sh index 803040ad41a..36b31b17ba7 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -71,7 +71,7 @@ docker buildx bake --no-cache --load --progress=plain -f "$SCRIPT_DIR/autoware-u --set "*.args.BASE_IMAGE=$base_image" \ --set "*.args.PREBUILT_BASE_IMAGE=$prebuilt_base_image" \ --set "*.args.SETUP_ARGS=$setup_args" \ - --set "devel.tags=ghcr.io/autowarefoundation/autoware-universe:$rosdistro-latest$image_name_suffix" \ - --set "prebuilt.tags=ghcr.io/autowarefoundation/autoware-universe:$rosdistro-latest-prebuilt$image_name_suffix" \ + --set "devel.tags=ghcr.io/automotiveaichallenge/autoware-universe:$rosdistro-latest$image_name_suffix" \ + --set "prebuilt.tags=ghcr.io/automotiveaichallenge/autoware-universe:$rosdistro-latest-prebuilt$image_name_suffix" \ "${targets[@]}" set +x