Skip to content

Commit

Permalink
Merge branch 'feature/parameter_value_distribution' into feature/prep…
Browse files Browse the repository at this point in the history
…rocessor_command
  • Loading branch information
HansRobo authored Feb 6, 2025
2 parents 5452759 + e2f9c29 commit bf3c719
Show file tree
Hide file tree
Showing 177 changed files with 5,186 additions and 1,470 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/Docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,61 @@ on:
required: true

jobs:
push_traffic_sim_docker:
name: Push Docker Image for traffic_simulator
runs-on: ubuntu-22.04
timeout-minutes: 720
strategy:
matrix:
rosdistro: [humble]

steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false

- name: Install docker for ubuntu runner
uses: docker/setup-buildx-action@v3

- uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
if: github.event_name == 'pull_request'
uses: docker/[email protected]
with:
files: |
./docker-bake.hcl
workdir: .
set: |
*.cache-to=type=gha,mode=max
*.cache-from=type=gha
push: false
targets: |
traffic_simulator_${{ matrix.rosdistro }}
- name: Build and push
if: github.event_name == 'workflow_dispatch'
uses: docker/[email protected]
with:
files: |
./docker-bake.hcl
workdir: .
set: |
*.cache-to=type=gha,mode=max
*.cache-from=type=gha
*.tags=ghcr.io/tier4/scenario_simulator_v2:traffic_simulator_${{ matrix.rosdistro }}-${{ github.event.inputs.version }}
push: true
targets: |
traffic_simulator_${{ matrix.rosdistro }}
push_docker:
name: Push Docker Image
runs-on: ubuntu-22.04
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/Documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
branches:
- master
pull_request:
branches:
- master

jobs:
generate:
Expand Down Expand Up @@ -68,7 +66,7 @@ jobs:
run: doxygen Doxyfile

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: api_documentation_site
path: html
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/InterfaceUpdateNotification.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Interface update notification
on:
pull_request:
branches:
- master
paths:
- openscenario/openscenario_interpreter_msgs/msg/*.msg
- simulation/traffic_simulator_msgs/msg/*.msg
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/PostCheckList.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Post check list
on:
pull_request:
branches:
- master
types: [opened, reopened]

jobs:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/SpellCheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Spell check
on:
workflow_dispatch:
pull_request:
branches:
- master

jobs:
spell-check:
Expand Down
47 changes: 47 additions & 0 deletions Dockerfile.traffic_simulator
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
ARG ROS_DISTRO="humble"
FROM ros:${ROS_DISTRO} as build-stage

Check warning on line 2 in Dockerfile.traffic_simulator

View workflow job for this annotation

GitHub Actions / Push Docker Image for traffic_simulator (humble)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
SHELL ["/bin/bash", "-c"]
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBCONF_NOWARNINGS=yes

# cspell: ignore kisak
RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
--mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \
apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache && \
add-apt-repository ppa:kisak/kisak-mesa -y && \
apt-get update && apt-get install libegl-mesa0 -y

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

WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator
COPY ./simulation/traffic_simulator /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/simulation/traffic_simulator
COPY ./simulation/traffic_simulator_msgs /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/simulation/traffic_simulator_msgs
COPY ./simulation/simulation_interface /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/simulation/simulation_interface
COPY ./external/concealer /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/external/concealer
COPY ./common /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/common
COPY ./dependency_${ROS_DISTRO}.repos /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/dependency_${ROS_DISTRO}.repos
RUN vcs import external < dependency_${ROS_DISTRO}.repos
WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src
RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
--mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \
source /opt/ros/${ROS_DISTRO}/setup.bash \
&& apt-get update \
&& rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} -t build -t buildtool -t exec

WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws

ENV CC="/usr/lib/ccache/gcc"
ENV CXX="/usr/lib/ccache/g++"
ENV CCACHE_DIR="/ccache"
RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \
colcon build --symlink-install \
--cmake-args \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DBUILD_TESTING=OFF
COPY ./docker-entrypoint.sh /
RUN chmod a+x /docker-entrypoint.sh

ENTRYPOINT ["/docker-entrypoint.sh"]
92 changes: 92 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,98 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

9.4.0 (2025-02-06)
------------------
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Contributors: Tatsuya Yamasaki, yamacir-kit

9.3.1 (2025-02-06)
------------------
* Merge branch 'master' into chore/delete-target-branch-filter
* Contributors: Masaya Kataoka

9.3.0 (2025-02-05)
------------------
* Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator
* Contributors: Masaya Kataoka

9.2.0 (2025-02-05)
------------------
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, SzymonParapura

9.1.0 (2025-02-04)
------------------
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' of github.com:tier4/scenario_simulator_v2 into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Contributors: Dawid Moszyński, Grzegorz Maj, Kotaro Yoshimoto

9.0.3 (2025-01-31)
------------------
* Merge branch 'master' into RJD-1505/fix_slope_acceleration_sign
* Merge branch 'master' into RJD-1505/fix_slope_acceleration_sign
* Merge branch 'master' of github.com:tier4/scenario_simulator_v2 into RJD-1505/fix_slope_acceleration_sign
* Contributors: Grzegorz Maj, Kotaro Yoshimoto

9.0.2 (2025-01-31)
------------------

9.0.1 (2025-01-31)
------------------
* Merge branch 'master' into feat/vel_model_acc
* Merge branch 'master' into feat/vel_model_acc
* Contributors: Kotaro Yoshimoto

9.0.0 (2025-01-30)
------------------
* merge 8.0.2
* Merge tag '7.4.7' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1056-remove-current-time-step-time' into RJD-1057-remove-functions-forwarded-to-entity-base
* Contributors: Dawid Moszynski, Dawid Moszyński, Mateusz Palczuk, robomic

8.0.2 (2025-01-28)
------------------
* Merge branch 'master' into RJD-1495/fix
* Merge branch 'master' into RJD-1495/fix
* Merge tag '7.4.7' into RJD-1495/fix
* avoid race condition by returning by value
* Contributors: Dawid Moszyński, Tatsuya Yamasaki, robomic

8.0.1 (2025-01-28)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>8.0.1</version>
<version>9.4.0</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
106 changes: 106 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,112 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

9.4.0 (2025-02-06)
------------------
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Merge remote-tracking branch 'origin/master' into feature/support-latest-autoware-message-type
* Merge branch 'master' into feature/support-latest-autoware-message-type
* Contributors: Tatsuya Yamasaki, yamacir-kit

9.3.1 (2025-02-06)
------------------
* Merge branch 'master' into chore/delete-target-branch-filter
* Contributors: Masaya Kataoka

9.3.0 (2025-02-05)
------------------
* Merge remote-tracking branch 'origin/master' into feature/docker/traffic_simulator
* Contributors: Masaya Kataoka

9.2.0 (2025-02-05)
------------------
* Merge pull request `#1493 <https://github.com/tier4/scenario_simulator_v2/issues/1493>`_ from tier4/fix/slope_inaccuracies
Fix/slope inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* Merge branch 'master' into fix/slope_inaccuracies
* ref(behavior_tree_plugin): refactor ActionNode::calculateUpdatedEntityStatusInWorldFrame
* ref(geometry): remove confusing operator*(quat,vec)
* feat(traffic_simulator): improve moveTowardsLaneletPose to calc LaneletPose and return it
* ref(geometry): remove rotate
* Revert "ref(geometry): add axis header, improve"
This reverts commit 26f8a6547e0c4573a9ca4738e5486335a2c9e8b4.
* ref(geometry): add axis header, improve
* refactor(behavior_tree_plugin): refactor action_node::calculateUpdatedEntityStatusInWorldFrame
* fix(behavior_tree_plugin) Fix isssue with pedestrian turning
* Contributors: Dawid Moszynski, Dawid Moszyński, Kotaro Yoshimoto, SzymonParapura

9.1.0 (2025-02-04)
------------------
* Merge pull request `#1487 <https://github.com/tier4/scenario_simulator_v2/issues/1487>`_ from tier4/RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' of github.com:tier4/scenario_simulator_v2 into RJD-1489/NpcCenterLine
* Review changes
* Add new algorithm
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Merge branch 'master' into RJD-1489/NpcCenterLine
* Contributors: Dawid Moszyński, Grzegorz Maj, Kotaro Yoshimoto

9.0.3 (2025-01-31)
------------------
* Merge branch 'master' into RJD-1505/fix_slope_acceleration_sign
* Merge branch 'master' into RJD-1505/fix_slope_acceleration_sign
* Merge branch 'master' of github.com:tier4/scenario_simulator_v2 into RJD-1505/fix_slope_acceleration_sign
* Contributors: Grzegorz Maj, Kotaro Yoshimoto

9.0.2 (2025-01-31)
------------------

9.0.1 (2025-01-31)
------------------
* Merge branch 'master' into feat/vel_model_acc
* Merge branch 'master' into feat/vel_model_acc
* Contributors: Kotaro Yoshimoto

9.0.0 (2025-01-30)
------------------
* merge 8.0.2
* Merge tag '7.4.7' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'master' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge branch 'RJD-1057-traffic-lights-tests' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-remove-functions-forwarded-to-entity-base-middle
* Merge remote-tracking branch 'origin/RJD-1056-remove-current-time-step-time' into RJD-1057-remove-functions-forwarded-to-entity-base
* Contributors: Dawid Moszynski, Dawid Moszyński, Mateusz Palczuk, robomic

8.0.2 (2025-01-28)
------------------
* Merge branch 'master' into RJD-1495/fix
* Merge branch 'master' into RJD-1495/fix
* Merge tag '7.4.7' into RJD-1495/fix
* avoid race condition by returning by value
* Contributors: Dawid Moszyński, Tatsuya Yamasaki, robomic

8.0.1 (2025-01-28)
------------------

Expand Down
Loading

0 comments on commit bf3c719

Please sign in to comment.