Skip to content

Commit

Permalink
Merge branch 'main' into feat/cuda-deps-aw-0.41.0
Browse files Browse the repository at this point in the history
  • Loading branch information
amadeuszsz authored Feb 12, 2025
2 parents efede82 + 6e6cc90 commit 9550b20
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 11 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/autoware-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ on:
branches:
- main
paths:
- .github/actions/docker-build-and-push-base
- .github/workflows/autoware-base.yaml
- amd64.env
- ansible-galaxy-requirements.yaml
- ansible/playbooks/openadkit.yaml
- ansible/roles/**
- arm64.env
- docker/Dockerfile.base
- docker/etc
- docker/scripts/cleanup_*.sh
- .github/actions/docker-build-and-push-base/*
- .github/workflows/autoware-base.yaml
- setup-dev-env.sh
schedule:
- cron: 0 0 15 * * # every 15th of the month
workflow_dispatch:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/docker-build-and-push-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

docker-build-and-push:
needs: load-env
runs-on: [self-hosted, linux, ARM64]
runs-on: ubuntu-22.04-arm
steps:
# https://github.com/actions/checkout/issues/211
- name: Change permission of workspace
Expand Down Expand Up @@ -48,6 +48,11 @@ jobs:
(github.event_name == 'push' && github.ref_type == 'tag') }}
uses: ./.github/actions/free-disk-space

- name: Set Swap Space
uses: pierotofy/set-swap-space@0404882bc4666c0ff2f6fd8b3d32af69a730183c
with:
swap-size-gb: 16

- name: Build 'Autoware' without CUDA
if: ${{ steps.changed-files.outputs.any_changed == 'true' ||
github.event_name == 'workflow_dispatch' ||
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/health-check-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

docker-build:
needs: load-env
runs-on: [self-hosted, linux, ARM64]
runs-on: ubuntu-22.04-arm
steps:
# https://github.com/actions/checkout/issues/211
- name: Change permission of workspace
Expand All @@ -29,6 +29,11 @@ jobs:
- name: Free disk space
uses: ./.github/actions/free-disk-space

- name: Set Swap Space
uses: pierotofy/set-swap-space@0404882bc4666c0ff2f6fd8b3d32af69a730183c
with:
swap-size-gb: 16

- name: Build 'Autoware'
uses: ./.github/actions/docker-build
with:
Expand Down
2 changes: 1 addition & 1 deletion .webauto-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ simulations:
launch_autoware: "true"
autoware_launch_package: autoware_launch
autoware_launch_file: planning_simulator.launch.xml
architecture_type: awf/universe/20230906
architecture_type: awf/universe/20250130
vehicle_model: sample_vehicle
sensor_model: sample_sensor_kit
initialize_duration: "90"
Expand Down
4 changes: 4 additions & 0 deletions autoware-nightly.repos
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ repositories:
type: git
url: https://github.com/autowarefoundation/autoware.core.git
version: main
core/autoware_utils: # TODO(mitsudome-r): Remove this repository entry when https://github.com/autowarefoundation/autoware/pull/5700 is merged.
type: git
url: https://github.com/autowarefoundation/autoware_utils.git
version: main
universe/autoware.universe:
type: git
url: https://github.com/autowarefoundation/autoware.universe.git
Expand Down
10 changes: 5 additions & 5 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ repositories:
core/autoware_utils:
type: git
url: https://github.com/autowarefoundation/autoware_utils.git
version: 1.0.0
version: 1.1.0
core/autoware_lanelet2_extension:
type: git
url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
version: 0.6.2
core/autoware.core:
type: git
url: https://github.com/autowarefoundation/autoware.core.git
version: 0.1.0
version: 0.2.0
# universe
universe/autoware.universe:
type: git
url: https://github.com/autowarefoundation/autoware.universe.git
version: 0.40.0
version: 0.41.1
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: v0.40.0
version: 0.41.0
universe/external/tier4_autoware_msgs:
type: git
url: https://github.com/tier4/tier4_autoware_msgs.git
Expand Down Expand Up @@ -79,7 +79,7 @@ repositories:
launcher/autoware_launch:
type: git
url: https://github.com/autowarefoundation/autoware_launch.git
version: 0.40.0
version: 0.41.0
# sensor_component
sensor_component/external/sensor_component_description:
type: git
Expand Down
1 change: 1 addition & 0 deletions simulator-nightly.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
repositories:
2 changes: 1 addition & 1 deletion simulator.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
simulator/scenario_simulator:
type: git
url: https://github.com/tier4/scenario_simulator_v2.git
version: 8.0.0
version: 10.0.0
5 changes: 5 additions & 0 deletions tools-nightly.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repositories:
tools:
type: git
url: https://github.com/autowarefoundation/autoware_tools.git
version: main

0 comments on commit 9550b20

Please sign in to comment.