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

chore: sync upstream

.github/sync-files.yaml

@@ -16,6 +16,7 @@
     - source: .github/workflows/sync-files.yaml
     - source: .clang-format
     - source: .clang-tidy
+    - source: .gitignore
     - source: .markdownlint.yaml
     - source: .pre-commit-config.yaml
     - source: .pre-commit-config-ansible.yaml
@@ -36,6 +37,8 @@
       pre-commands: |
         sd "GITHUB_TOKEN" "REPO_TOKEN" {source}
 
+    - source: .github/workflows/load-env.yaml
+
     - source: .github/workflows/setup-universe.yaml
       dest: .github/workflows/setup-local-dev-env.yaml
       pre-commands: |
@@ -69,11 +72,11 @@
       pre-commands: |
         latest_hash=$(git ls-remote --heads https://github.com/autowarefoundation/autoware.git refs/heads/main | awk '{print $1}')
         sd "\z" \
-          "
+        "
           - name: https://github.com/autowarefoundation/autoware.git#/ansible
             type: git
             version: $latest_hash
-          " {source}
+        " {source}
 
     # Docker
     - source: docker/README.md

.github/workflows/load-env.yaml

@@ -0,0 +1,32 @@
+name: load-env
+
+on:
+  workflow_call:
+    outputs:
+      base-image:
+        value: ${{ jobs.load-env.outputs.base-image }}
+      rosdistro:
+        value: ${{ jobs.load-env.outputs.rosdistro }}
+
+jobs:
+  load-env:
+    runs-on: ubuntu-latest
+    outputs:
+      base-image: ${{ steps.set-env.outputs.base-image }}
+      rosdistro: ${{ steps.set-env.outputs.rosdistro }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Load env
+        run: |
+          cat amd64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
+          if [ "$(uname -m)" = "aarch64" ]; then
+            cat arm64.env | sed -e "s/^\s*//" -e "/^#/d" >> $GITHUB_ENV
+          fi
+
+      - name: Set env
+        id: set-env
+        run: |
+          echo "base-image=${{ env.base_image }}" >> $GITHUB_OUTPUT
+          echo "rosdistro=${{ env.rosdistro }}" >> $GITHUB_OUTPUT

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

@@ -23,7 +23,7 @@ jobs:
           base-branch: awf-latest
           sync-pr-branch: sync-awf-latest
           sync-target-repository: https://github.com/tier4/pilot-auto
-          sync-target-branch: tier4/universe
+          sync-target-branch: main
           pr-title: "chore: sync awf-latest"
           pr-labels: |
             bot

.github/workflows/sync-upstream.yaml

@@ -20,10 +20,10 @@ jobs:
         uses: autowarefoundation/autoware-github-actions/sync-branches@v1
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          base-branch: tier4/universe
+          base-branch: main
           sync-pr-branch: sync-upstream
           sync-target-repository: https://github.com/tier4/pilot-auto.git
-          sync-target-branch: tier4/universe
+          sync-target-branch: main
           pr-title: "chore: sync upstream"
           pr-labels: |
             bot

.gitignore

@@ -1,67 +1,25 @@
-# GNU global tags
-GTAGS
-GRTAGS
-GSYMS
-GPATH
-
-# Python byte-compile file
-__pycache__/
-*.py[co]
-
-# editor backup files
-*~
-\#*\#
-
-# backup files
-*.bak
-
-# Eclipse
-.cproject
-.project
-.pydevproject
-.settings/
+# Vim
+*.swp
+*.swo
 
 # Visual Studio Code
 .vscode/
 *.code-workspace
 
-# CLion
-.idea/
-cmake-build-debug/
-
-# ROSBag files
-*.bag
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-
-# Autoware Resources
-*.pcd
-*.bag
-*.csv
-
-/.metadata/
-
 # colcon
 build/
 install/
 log/
+/src/
 
-# catkin
-build/
-devel/
-install/
-logs/
-.catkin_tools/
+# Python
+*.pyc
 
-# cspell
-.cspell.json
+# Jetbrains
+.idea/
 
-# temporary ignored packages
-src/**/COLCON_IGNORE
+# rviz Screen Capture
+capture/
 
-# Don't ignore src/ because full-text search won't work.
+# CodeChecker
+.codechecker/

autoware.repos

@@ -49,10 +49,6 @@ repositories:
     type: git
     url: https://github.com/tier4/sensor_component_description.git
     version: main
-  description/sensor/aip_description:
-    type: git
-    url: https://github.com/tier4/aip_description.iv.git
-    version: main
   description/vehicle/lexus_description:
     type: git
     url: https://github.com/tier4/lexus_description.iv.git