Skip to content

Commit 0881b37

Browse files
authored
Merge branch 'master' into doc/longitudinal-control
2 parents 5eefcc9 + a0b0574 commit 0881b37

File tree

60 files changed

+223
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+223
-95
lines changed

.github/workflows/Docker.yaml

Lines changed: 0 additions & 66 deletions
This file was deleted.

.github/workflows/Release.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
statuses: write
3030
timeout-minutes: 10
3131
container: ros:humble
32+
outputs:
33+
new_version: ${{ steps.new_version.outputs.new_version }}
3234
steps:
3335
- name: Restore branch
3436
uses: levonet/action-restore-branch@master
@@ -140,3 +142,50 @@ jobs:
140142
repo: context.repo.repo,
141143
ref: `heads/${context.payload.pull_request.head.ref}`,
142144
})
145+
push_docker:
146+
needs: release
147+
name: Push Docker Image
148+
runs-on: ubuntu-22.04
149+
timeout-minutes: 720
150+
strategy:
151+
matrix:
152+
rosdistro: [humble]
153+
arch: [amd64]
154+
# Build test for arm64 CPU is broken.
155+
# This is a temporary solution and will be repaired in the future.
156+
# See also https://github.com/tier4/scenario_simulator_v2/pull/1295
157+
# arch: [amd64, arm64]
158+
steps:
159+
- name: Free Disk Space (Ubuntu)
160+
uses: jlumbroso/free-disk-space@main
161+
with:
162+
tool-cache: false
163+
164+
- name: Install docker for ubuntu runner
165+
uses: docker/setup-buildx-action@v3
166+
167+
- name: Install QEMU
168+
uses: docker/setup-qemu-action@v3
169+
170+
- uses: actions/checkout@v3
171+
172+
- name: Login to GitHub Container Registry
173+
uses: docker/login-action@v2
174+
with:
175+
registry: ghcr.io
176+
username: ${{ github.actor }}
177+
password: ${{ secrets.GITHUB_TOKEN }}
178+
179+
- name: Build and push (${{ matrix.arch }})
180+
uses: docker/bake-action@v3
181+
with:
182+
files: |
183+
./docker-bake.hcl
184+
workdir: .
185+
set: |
186+
*.cache-to=type=gha,mode=max
187+
*.cache-from=type=gha
188+
*.tags=ghcr.io/tier4/scenario_simulator_v2:humble-${{ needs.release.outputs.new_version }}
189+
push: ${{ github.event.pull_request.merged == true }}
190+
targets: |
191+
${{ matrix.rosdistro }}_base_${{ matrix.arch }}

common/math/arithmetic/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Changelog for package arithmetic
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
3.0.1 (2024-07-10)
25+
------------------
26+
* Merge branch 'master' into feature/docker_tag
27+
* Contributors: Tatsuya Yamasaki
28+
2429
3.0.0 (2024-07-10)
2530
------------------
2631
* Merge branch 'master' into ref/RJD-1053-implement-pose-utils

common/math/arithmetic/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>arithmetic</name>
5-
<version>3.0.0</version>
5+
<version>3.0.1</version>
66
<description>arithmetic library for scenario_simulator_v2</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

common/math/geometry/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Changelog for package geometry
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
3.0.1 (2024-07-10)
25+
------------------
26+
* Merge branch 'master' into feature/docker_tag
27+
* Contributors: Tatsuya Yamasaki
28+
2429
3.0.0 (2024-07-10)
2530
------------------
2631
* Merge branch 'master' into ref/RJD-1053-implement-pose-utils

common/math/geometry/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>geometry</name>
5-
<version>3.0.0</version>
5+
<version>3.0.1</version>
66
<description>geometry math library for scenario_simulator_v2 application</description>
77
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
88
<license>Apache License 2.0</license>

common/scenario_simulator_exception/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Changelog for package scenario_simulator_exception
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
3.0.1 (2024-07-10)
25+
------------------
26+
* Merge branch 'master' into feature/docker_tag
27+
* Contributors: Tatsuya Yamasaki
28+
2429
3.0.0 (2024-07-10)
2530
------------------
2631
* Merge branch 'master' into ref/RJD-1053-implement-pose-utils

common/scenario_simulator_exception/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>scenario_simulator_exception</name>
5-
<version>3.0.0</version>
5+
<version>3.0.1</version>
66
<description>Exception types for scenario simulator</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

common/simple_junit/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Changelog for package junit_exporter
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
3.0.1 (2024-07-10)
25+
------------------
26+
* Merge branch 'master' into feature/docker_tag
27+
* Contributors: Tatsuya Yamasaki
28+
2429
3.0.0 (2024-07-10)
2530
------------------
2631
* Merge branch 'master' into ref/RJD-1053-implement-pose-utils

common/simple_junit/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>simple_junit</name>
5-
<version>3.0.0</version>
5+
<version>3.0.1</version>
66
<description>Lightweight JUnit library for ROS 2</description>
77
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
88
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>

0 commit comments

Comments
 (0)