Merge branch 'develop' into missing_io

svanderweyst-cpr · Nov 3, 2021 · 94ecb43 · 94ecb43
2 parents 417d827 + 26ac2ee
commit 94ecb43
Show file tree

Hide file tree

Showing 4 changed files with 511 additions and 466 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,25 +1,31 @@
 name: CI
 
-on:
-  push:
-  pull_request:
-    branches-ignore:
-      - develop
+on: [push, pull_request]
 
 jobs:
   ci:
     name: ${{ matrix.ros_distro }}
+    if: ${{ github.actor != 'RWT-bot' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ros_distro: [kinetic, melodic] # Temp remove noetic waitng for release of tf2_web_republisher
+        ros_distro: [melodic, noetic]
         node_version: [14]
     steps:
       - uses: actions/checkout@v2
+        env:
+          TOKEN: "${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' && secrets.RWT_BOT_PAT || github.token }}"
+        with:
+          token: ${{ env.TOKEN }}
       - name: Docker pull
         run: docker pull ros:${{ matrix.ros_distro }}-ros-core
       - name: Docker build
         run: docker build --build-arg ROS_DISTRO="${{ matrix.ros_distro }}" --build-arg NODE_VERSION="${{ matrix.node_version }}" -t roslibjsdocker .
       - name: Tests
         run: docker run -v $(pwd):/root/roslibjs --rm roslibjsdocker bash -i -c 'bash /root/roslibjs/test/build.bash'
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        if: ${{ github.event_name == 'push' && github.ref == 'develop' && matrix.ros_distro == 'noetic' }}
+        with:
+          commit_message: Update Build
+          file_pattern: 'build/*.js'