Remove references to iron from mergify, comment in docker workflow

apl-ocean-engineering · Aug 30, 2023 · 0e80eff · 0e80eff
1 parent 5dce1a5
commit 0e80eff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,12 +1,4 @@
 pull_request_rules:
-  - name: backport to iron at reviewers discretion
-    conditions:
-      - base=main
-      - "label=backport-iron"
-    actions:
-      backport:
-        branches:
-          - iron
 
   - name: ask to resolve conflict
     conditions:

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -1,5 +1,8 @@
 name: Build Docker Images
 
+# There's room for a more sophisticated Docker-image-building apparatus here
+# built around the different ROS2 version branches
+# But it hurts my head.
 on:
   push:
     branches: [main]