Skip to content

Commit 958bce8

Browse files
takanotaigatakanotaiga
authored
Merge branch 'master' into refactor/behavior-tree-2
2 parents 411073d + 427debb commit 958bce8

File tree

65 files changed

+136
-35
lines changed

Some content is hidden

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

65 files changed

+136
-35
lines changed

‎.github/workflows/Release.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
new_version: ${{ steps.new_version.outputs.new_version }}
3434
steps:
3535
- name: Restore branch
36+
if: github.event.pull_request.merged == true
3637
uses: levonet/action-restore-branch@master
3738

3839
- name: Install bloom
@@ -42,6 +43,7 @@ jobs:
4243
uses: actions/checkout@v4
4344
with:
4445
ref: master
46+
repository: ${{ github.event.pull_request.base.repo.full_name }}
4547
fetch-depth: 0
4648
fetch-tags: true
4749

@@ -50,16 +52,19 @@ jobs:
5052
git config --global user.name "Release Bot"
5153
git config --global user.email "[email protected]"
5254
git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2
53-
git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}
5455
git config pull.rebase false
5556
57+
- name: Setup git credential
58+
if: github.event.pull_request.merged == true
59+
run: git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }}
60+
5661
- name: Get old version
5762
id: old_version
5863
run: |
5964
echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT
6065
61-
- name: Merge branch
62-
run: git pull origin ${{ github.head_ref }}
66+
- name: Pull head branch
67+
run: git pull ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.head_ref }}
6368

6469
- name: Bump patch version
6570
if: (contains(github.event.pull_request.labels.*.name, 'bump patch'))

‎common/agnocast_wrapper/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package agnocast_wrapper
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
16.4.2 (2025-05-23)
6+
-------------------
7+
58
16.4.1 (2025-05-23)
69
-------------------
710
* Merge branch 'master' into refactor/behavior-tree-1

‎common/agnocast_wrapper/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>agnocast_wrapper</name>
5-
<version>16.4.1</version>
5+
<version>16.4.2</version>
66
<description>A wrapper package for agnocast</description>
77
<maintainer email="[email protected]">Mateusz Palczuk</maintainer>
88
<license>Apache License 2.0</license>

‎common/get_parameter/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package get_parameter
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
16.4.2 (2025-05-23)
6+
-------------------
7+
58
16.4.1 (2025-05-23)
69
-------------------
710
* Merge branch 'master' into refactor/behavior-tree-1

‎common/get_parameter/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>get_parameter</name>
5-
<version>16.4.1</version>
5+
<version>16.4.2</version>
66
<description>Thin wrapper for rclcpp::Node::get_parameter</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

‎common/math/arithmetic/CHANGELOG.rst‎

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

24+
16.4.2 (2025-05-23)
25+
-------------------
26+
2427
16.4.1 (2025-05-23)
2528
-------------------
2629
* Merge branch 'master' into refactor/behavior-tree-1

‎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>16.4.1</version>
5+
<version>16.4.2</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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Changelog for package geometry
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
16.4.2 (2025-05-23)
25+
-------------------
26+
2427
16.4.1 (2025-05-23)
2528
-------------------
2629
* Merge branch 'master' into refactor/behavior-tree-1

‎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>16.4.1</version>
5+
<version>16.4.2</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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Changelog for package scenario_simulator_exception
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
16.4.2 (2025-05-23)
25+
-------------------
26+
2427
16.4.1 (2025-05-23)
2528
-------------------
2629
* Merge branch 'master' into refactor/behavior-tree-1

0 commit comments

Comments
 (0)