Merge branch 'main' into dependabot/github_actions/actions/checkout-4

autowarefoundation · Nov 27, 2023 · 64ba38d · 64ba38d
2 parents 05b4f4a + d19a09f
commit 64ba38d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -6,5 +6,5 @@ updates:
       interval: daily
     open-pull-requests-limit: 1
     labels:
-      - bot
-      - github-actions
+      - tag:bot
+      - type:github-actions
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -4,7 +4,7 @@
 daysUntilClose: false
 
 # Label to use when marking as stale
-staleLabel: stale
+staleLabel: status:stale
 
 # Comment to post when marking as stale
 markComment: >

diff --git a/.github/workflows/sync-files.yaml b/.github/workflows/sync-files.yaml
@@ -28,6 +28,6 @@ jobs:
         with:
           token: ${{ steps.generate-token.outputs.token }}
           pr-labels: |
-            bot
-            sync-files
+            tag:bot
+            tag:sync-files
           auto-merge-method: squash
diff --git a/autoware_adapi_v1_msgs/system/msg/MrmState.msg b/autoware_adapi_v1_msgs/system/msg/MrmState.msg
@@ -13,6 +13,7 @@ uint16 MRM_FAILED = 4
 uint16 NONE = 1
 uint16 EMERGENCY_STOP = 2
 uint16 COMFORTABLE_STOP = 3
+uint16 PULL_OVER = 4
 
 uint16 state
 uint16 behavior