update CI

Author: nim65s

.github/workflows/ci-linux-ros.yml

@@ -1,21 +1,20 @@
 name: CI - Linux - ROS
-
 on:
   push:
     branches:
-    - master
-    - devel
+      - devel
+      - master
+      - main
   pull_request:
     branches:
-    - master
-    - devel
-
+      - devel
+      - master
+      - main
 jobs:
   ROS:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: noetic, BUILDER: catkin_tools}
           - {ROS_DISTRO: rolling}
           - {ROS_DISTRO: jazzy}
           - {ROS_DISTRO: iron}
@@ -24,12 +23,22 @@ jobs:
       CCACHE_DIR: /github/home/.ccache
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: recursive
       - uses: actions/cache@v4
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ccache-${{ matrix.env.ROS_DISTRO }}
-      - uses: 'ros-industrial/industrial_ci@d23b9ad2c63bfad638a2b1fe3df34b8df9a2f17b'
+      - uses: 'ros-industrial/industrial_ci@eb3ea328ff056aa2435d5b3493e7e2929c310f8e'
         env: ${{ matrix.env }}
+  check:
+    if: always()
+    name: check-linux-ros
+    runs-on: ubuntu-latest
+    needs:
+      - ROS
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/nix.yml

@@ -1,19 +1,36 @@
 name: "CI - Nix"
-
 on:
   push:
-
+    branches:
+      - devel
+      - master
+      - main
+  pull_request:
+    branches:
+      - devel
+      - master
+      - main
 jobs:
   nix:
     runs-on: "${{ matrix.os }}-latest"
     strategy:
       matrix:
         os: [ubuntu, macos]
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
-      - uses: cachix/cachix-action@v15
+      - uses: actions/checkout@v5
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v16
         with:
           name: gepetto
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix build -L
+      - run: nix flake check -L
+  check:
+    if: always()
+    name: check-macos-linux-nix
+    runs-on: ubuntu-latest
+    needs:
+      - nix
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.mergify.yml

@@ -1,16 +1,13 @@
 pull_request_rules:
-  - name: merge automatically when CI passes and PR is approved
+  - name: merge [bot] PRs when CI pass
     conditions:
-      - check-success = "ROS (humble)"
-      - check-success = "ROS (iron)"
-      - check-success = "ROS (jazzy)"
-      - check-success = "ROS (rolling)"
-      - check-success = "nix (macos)"
-      - check-success = "nix (ubuntu)"
-      - check-success = "gitlab-ci"
+      - check-success = "check-macos-linux-nix"
+      - check-success = "check-linux-ros"
       - check-success = "pre-commit.ci - pr"
       - or:
-        - author = pre-commit-ci[bot]
-        - author = dependabot[bot]
+          - author = dependabot[bot]
+          - author = github-actions[bot]
+          - author = hrp2-14
+          - author = pre-commit-ci[bot]
     actions:
       merge: