From 9d8fdeba2937bd69ec742442af879a0aa5a7882e Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 8 Dec 2023 16:19:52 +0900 Subject: [PATCH 1/5] Introduce merge queue --- .github/workflows/build_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 8977e1b28..559c84f34 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -4,6 +4,7 @@ name: build test on: workflow_dispatch: pull_request: + merge_group: jobs: job: From 9c53ab3c9e37482605787fcd5a78c68b19805ebf Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 8 Dec 2023 16:27:02 +0900 Subject: [PATCH 2/5] Revert "Introduce merge queue" --- .github/workflows/build_test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 559c84f34..8977e1b28 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -4,7 +4,6 @@ name: build test on: workflow_dispatch: pull_request: - merge_group: jobs: job: From bcc521a48352416628c70f7eaae50227b5492817 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 8 Dec 2023 16:28:16 +0900 Subject: [PATCH 3/5] Update build_test.yaml --- .github/workflows/build_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 8977e1b28..559c84f34 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -4,6 +4,7 @@ name: build test on: workflow_dispatch: pull_request: + merge_group: jobs: job: From a965e3ca9ef54913632d72807c5904dc192b66ed Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 8 Dec 2023 19:24:00 +0900 Subject: [PATCH 4/5] Update build_test.yaml --- .github/workflows/build_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index 559c84f34..00c619cbc 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -6,6 +6,7 @@ on: pull_request: merge_group: + jobs: job: name: BuildAndRun From 55f731c8c5b33dff5e1d2fb28bdbad522c7f348e Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 8 Dec 2023 20:00:17 +0900 Subject: [PATCH 5/5] =?UTF-8?q?inline=E5=8C=96=E5=BF=98=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../include/crane_geometry/geometry_operations.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utility/crane_geometry/include/crane_geometry/geometry_operations.hpp b/utility/crane_geometry/include/crane_geometry/geometry_operations.hpp index 19400c3fe..836fc18ea 100644 --- a/utility/crane_geometry/include/crane_geometry/geometry_operations.hpp +++ b/utility/crane_geometry/include/crane_geometry/geometry_operations.hpp @@ -49,7 +49,7 @@ inline double getAngleDiff(double angle_rad1, double angle_rad2) } } -double getIntermediateAngle(double angle_rad1, double angle_rad2) +inline double getIntermediateAngle(double angle_rad1, double angle_rad2) { angle_rad1 = normalizeAngle(angle_rad1); angle_rad2 = normalizeAngle(angle_rad2);