From 0e80eff7de3983a7a58485d9effd42f8a5e982b1 Mon Sep 17 00:00:00 2001
From: Aaron Marburg <amarburg@uw.edu>
Date: Wed, 30 Aug 2023 11:09:53 -0700
Subject: [PATCH] Remove references to iron from mergify, comment in docker
 workflow

---
 .github/mergify.yml           | 8 --------
 .github/workflows/docker.yaml | 3 +++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 9600cee..38eb702 100644
--- 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
index 0742622..4d0eb68 100644
--- 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]