Merge pull request #149 in SWDEV/franka_ros from fix/build-also-on-de…

…velop to develop * commit '50d5f48951e1ca618a0a0ecde63a846a5fa6e551': CI: Also build on develop if no PR was opened
frankaemika · Nov 5, 2021 · 2b1665a · 2b1665a
2 parents 7558302 + 50d5f48
commit 2b1665a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,15 +34,15 @@ jobs:
       run:  echo "FLAVOR=$(echo ${{ github.event.pull_request.base.ref }} | sed 's/-devel//')" >> $GITHUB_ENV
 
     - name: Build Docker Image
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: docker/build-push-action@v2
       with:
         tags: franka_ros:${{matrix.ros_distro}}
         file: .ci/Dockerfile.${{matrix.ros_distro}}
         push: false
 
     - name: Compile with Catkin Tools
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
         image:    franka_ros:${{matrix.ros_distro}}
@@ -52,7 +52,7 @@ jobs:
           catkin build --workspace /ros/ --interleave-output --verbose
 
     - name: Compile with Catkin Make
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
         image:    franka_ros:${{matrix.ros_distro}}
@@ -65,7 +65,7 @@ jobs:
           catkin_make -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
     - name: Check Format
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
         image:    franka_ros:${{matrix.ros_distro}}
@@ -77,7 +77,7 @@ jobs:
           cmake --build /ros/build --target check-pyformat
 
     - name: Check Linting
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
         image:    franka_ros:${{matrix.ros_distro}}
@@ -88,7 +88,7 @@ jobs:
           cmake --build /ros/build --target check-tidy
 
     - name: Run Tests
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       uses: addnab/docker-run-action@v3
       with:
         image:    franka_ros:${{matrix.ros_distro}}
@@ -102,7 +102,7 @@ jobs:
 
     - name: Upload Tests to Artifacts
       uses: actions/upload-artifact@v2
-      if:   ${{env.FLAVOR == 'develop' || env.FLAVOR == matrix.ros_distro}}
+      if:   github.ref == 'refs/heads/develop' || ${{env.FLAVOR == matrix.ros_distro}}
       with:
         name: test-results
         path: build/test_results/*/rosunit-*.xml