Merge pull request autowarefoundation#423 from tier4/sync-upstream

chore: sync upstream

.github/workflows/pre-commit.yaml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   pre-commit:
-    if: ${{ github.event.repository.private }}
+    if: ${{ github.event.repository.private }} # Use pre-commit.ci for public repositories
     runs-on: ubuntu-latest
     steps:
       - name: Generate token

.github/workflows/sync-awf-latest-s1.yaml

@@ -22,8 +22,8 @@ jobs:
           token: ${{ steps.generate-token.outputs.token }}
           base-branch: awf-latest-s1
           sync-pr-branch: sync-awf-latest-s1
-          sync-target-repository: https://github.com/tier4/autoware_launch.git
-          sync-target-branch: awf-latest
+          sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
+          sync-target-branch: main
           pr-title: "chore: sync awf-latest-s1"
           pr-labels: |
             bot

.github/workflows/sync-awf-latest-x1.yaml

@@ -22,8 +22,8 @@ jobs:
           token: ${{ steps.generate-token.outputs.token }}
           base-branch: awf-latest-x1
           sync-pr-branch: sync-awf-latest-x1
-          sync-target-repository: https://github.com/tier4/autoware_launch.git
-          sync-target-branch: awf-latest
+          sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
+          sync-target-branch: main
           pr-title: "chore: sync awf-latest-x1"
           pr-labels: |
             bot

.github/workflows/sync-awf-latest-x2.yaml

@@ -22,8 +22,8 @@ jobs:
           token: ${{ steps.generate-token.outputs.token }}
           base-branch: awf-latest-x2
           sync-pr-branch: sync-awf-latest-x2
-          sync-target-repository: https://github.com/tier4/autoware_launch.git
-          sync-target-branch: awf-latest
+          sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
+          sync-target-branch: main
           pr-title: "chore: sync awf-latest-x2"
           pr-labels: |
             bot

.github/workflows/sync-awf-latest-xx1.yaml

@@ -22,8 +22,8 @@ jobs:
           token: ${{ steps.generate-token.outputs.token }}
           base-branch: awf-latest-xx1
           sync-pr-branch: sync-awf-latest-xx1
-          sync-target-repository: https://github.com/tier4/autoware_launch.git
-          sync-target-branch: awf-latest
+          sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
+          sync-target-branch: main
           pr-title: "chore: sync awf-latest-xx1"
           pr-labels: |
             bot

.github/workflows/sync-awf-autoware-launch.yaml → .github/workflows/sync-awf-upstream.yaml

@@ -1,12 +1,12 @@
-name: sync-awf-autoware-launch
+name: sync-awf-upstream
 
 on:
   schedule:
     - cron: 0 0 * * *
   workflow_dispatch:
 
 jobs:
-  sync-awf-autoware-launch:
+  sync-awf-upstream:
     runs-on: ubuntu-latest
     steps:
       - name: Generate token
@@ -20,12 +20,12 @@ jobs:
         uses: autowarefoundation/autoware-github-actions/sync-branches@v1
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          base-branch: awf-latest
-          sync-pr-branch: sync-awf-autoware-launch
+          base-branch: tier4/main
+          sync-pr-branch: sync-awf-upstream
           sync-target-repository: https://github.com/autowarefoundation/autoware_launch.git
           sync-target-branch: main
           pr-title: "chore: sync awf/autoware_launch"
           pr-labels: |
             bot
-            sync-awf-autoware-launch
+            sync-awf-upstream
           auto-merge-method: merge

.github/workflows/sync-upstream.yaml → .github/workflows/sync-tier4-upstream.yaml

@@ -1,12 +1,12 @@
-name: sync-upstream
+name: sync-tier4-upstream
 
 on:
   schedule:
     - cron: 0 0 * * *
   workflow_dispatch:
 
 jobs:
-  sync-upstream:
+  sync-tier4-upstream:
     runs-on: ubuntu-latest
     steps:
       - name: Generate token
@@ -21,11 +21,11 @@ jobs:
         with:
           token: ${{ steps.generate-token.outputs.token }}
           base-branch: tier4/main
-          sync-pr-branch: sync-upstream
+          sync-pr-branch: sync-tier4-upstream
           sync-target-repository: https://github.com/tier4/autoware_launch.git
           sync-target-branch: tier4/main
           pr-title: "chore: sync upstream"
           pr-labels: |
             bot
-            sync-upstream
+            sync-tier4-upstream
           auto-merge-method: merge

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 ci:
-  autofix_commit_msg: "ci(pre-commit): autofix"
+  autofix_commit_msg: "style(pre-commit): autofix"
   autoupdate_commit_msg: "ci(pre-commit): autoupdate"
 
 repos:
@@ -37,7 +37,10 @@ repos:
     rev: v0.8.0
     hooks:
       - id: flake8-ros
+      - id: prettier-xacro
+      - id: prettier-launch-xml
       - id: prettier-package-xml
+      - id: ros-include-guard
       - id: sort-package-xml
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
@@ -57,7 +60,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
         args: [--line-length=100]