Merge branch 'master' into feature/deceleration

OUXT-Polaris · Aug 14, 2023 · 8c008ed · 8c008ed
2 parents ab18676 + afcd2ed
commit 8c008ed
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 43 deletions.
diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 180
     strategy:
       fail-fast: false
@@ -40,6 +40,16 @@ jobs:
           apt remove libunwind-14-dev -y
           apt install python3-nose -y
           pip uninstall nose -y
+      - name: install ccache
+        run: |
+          apt install -y ccache
+      - name: Make ccache dir
+        run: |
+          mkdir -p /tmp/ccache
+      - uses: actions/cache@v3
+        with:
+          path: /tmp/ccache
+          key: ccache-${{ matrix.rosdistro }}
       - name: Search packages in this repository
         id: list_packages
         run: |
@@ -60,66 +70,50 @@ jobs:
           files: dependency.repos
           allow_failure: false
       - name: Run build test with dependency-${{ matrix.rosdistro }}.repos
-        uses: ros-tooling/action-ros-ci@v0.2
+        uses: ros-tooling/action-ros-ci@v0.3
         if: steps.check_rosdistro_repos_files.outputs.files_exists == 'true'
         with:
           package-name: ${{ steps.list_packages.outputs.package_list }}
           target-ros2-distro: ${{ matrix.rosdistro }}
           vcs-repo-file-url: dependency-${{ matrix.rosdistro }}.repos
-          colcon-defaults: |
-            {
-              "build": {
-                "mixin": ["coverage-gcc", "coverage-pytest"]
-              },
-              "test": {
-                "mixin": ["coverage-pytest"]
-              }
-            }
-          # If possible, pin the repository in the workflow to a specific commit to avoid
-          # changes in colcon-mixin-repository from breaking your tests.
-          colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/1ddb69bedfd1f04c2f000e95452f7c24a4d6176b/index.yaml
+          extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        env: 
+          CCACHE_DIR: /tmp/ccache
       - name: Run build test with dependency.repos
-        uses: ros-tooling/action-ros-ci@v0.2
+        uses: ros-tooling/action-ros-ci@v0.3
         if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'true'
         with:
           package-name: ${{ steps.list_packages.outputs.package_list }}
           target-ros2-distro: ${{ matrix.rosdistro }}
           vcs-repo-file-url: dependency.repos
-          colcon-defaults: |
-            {
-              "build": {
-                "mixin": ["coverage-gcc", "coverage-pytest"]
-              },
-              "test": {
-                "mixin": ["coverage-pytest"]
-              }
-            }
-          # If possible, pin the repository in the workflow to a specific commit to avoid
-          # changes in colcon-mixin-repository from breaking your tests.
-          colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/1ddb69bedfd1f04c2f000e95452f7c24a4d6176b/index.yaml
+          extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        env: 
+          CCACHE_DIR: /tmp/ccache
       - name: Run build test without .repos file
-        uses: ros-tooling/action-ros-ci@v0.2
+        uses: ros-tooling/action-ros-ci@v0.3
         if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false'
         with:
           package-name: ${{ steps.list_packages.outputs.package_list }}
           target-ros2-distro: ${{ matrix.rosdistro }}
-          colcon-defaults: |
-            {
-              "build": {
-                "mixin": ["coverage-gcc", "coverage-pytest"]
-              },
-              "test": {
-                "mixin": ["coverage-pytest"]
-              }
-            }
-          # If possible, pin the repository in the workflow to a specific commit to avoid
-          # changes in colcon-mixin-repository from breaking your tests.
-          colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/1ddb69bedfd1f04c2f000e95452f7c24a4d6176b/index.yaml
+          extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        env: 
+          CCACHE_DIR: /tmp/ccache
       - name: Notify Slack
         uses: 8398a7/action-slack@v2
         if: failure()
         with:
           status: ${{ job.status }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+  merge:
+    name: merge
+    runs-on: ubuntu-22.04
+    timeout-minutes: 180
+    needs: build
+    steps:
+      - name: merge PR
+        if : ${{ (github.event_name == 'pull_request') && (github.actor == 'wam-v-tan') }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh pr merge ${{ github.event.pull_request.html_url }} --merge
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -65,4 +65,4 @@ jobs:
           status: ${{ job.status }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/Review.yaml b/.github/workflows/Review.yaml
@@ -0,0 +1,24 @@
+name: CodeReview
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  pull_request:
+    types: [review_requested]
+
+jobs:
+  review:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.requested_reviewer.login == 'wam-v-tan' }}
+    steps:
+      - uses: OUXT-Polaris/chatgpt-github-actions@main
+        with:
+          openai_api_key: ${{ secrets.OPENAI_API_KEY }}
+          github_token: ${{ secrets.WAMV_TAN_BOT_SECRET }}
+          github_pr_id: ${{ github.event.number }}
+          openai_engine: "gpt-3.5-turbo" #optional
+          openai_temperature: 0.5 #optional
+          openai_max_tokens: 2048 #optional
+          mode: review
diff --git a/.github/workflows/UpdateWorkflowStatus.yaml b/.github/workflows/UpdateWorkflowStatus.yaml
@@ -3,6 +3,9 @@ on:
   pull_request:
     paths-ignore:
     - ".github/workflows/UpdateWorkflowStatus.yaml"
+    - ".github/workflows/BuildTest.yaml"
+    - ".github/workflows/Release.yaml"
+    - ".github/workflows/Review.yaml"
   workflow_dispatch:
 
 jobs:
@@ -16,4 +19,4 @@ jobs:
           token: ${{ secrets.WAMV_TAN_BOT_SECRET }}
           repo: OUXT-Polaris/ouxt_automation
           workflow: document
-          ref: master
+          ref: master