Do not expect an iron branch to be present

ros-controls · May 26, 2023 · 0749cca · 0749cca
1 parent c02a584
commit 0749cca
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/iron-abi-compatibility.yml b/.github/workflows/iron-abi-compatibility.yml
@@ -2,10 +2,9 @@ name: Iron - ABI Compatibility Check
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   pull_request:
     branches:
-      - iron
       - master
 
 jobs:

diff --git a/.github/workflows/iron-binary-build-main.yml b/.github/workflows/iron-binary-build-main.yml
@@ -5,14 +5,13 @@ name: Iron Binary Build - main
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   pull_request:
     branches:
-      - iron
       - master
   push:
     branches:
-      - iron
+      - master
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
@@ -24,4 +23,4 @@ jobs:
       ros_distro: iron
       ros_repo: main
       upstream_workspace: ros2_control-not-released.iron.repos
-      ref_for_scheduled_build: iron
+      ref_for_scheduled_build: master
diff --git a/.github/workflows/iron-binary-build-testing.yml b/.github/workflows/iron-binary-build-testing.yml
@@ -5,14 +5,13 @@ name: Iron Binary Build - testing
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   pull_request:
     branches:
-      - iron
       - master
   push:
     branches:
-      - iron
+      - master
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '03 1 * * *'
@@ -24,4 +23,4 @@ jobs:
       ros_distro: iron
       ros_repo: testing
       upstream_workspace: ros2_control-not-released.iron.repos
-      ref_for_scheduled_build: iron
+      ref_for_scheduled_build: master
diff --git a/.github/workflows/iron-semi-binary-build-main.yml b/.github/workflows/iron-semi-binary-build-main.yml
@@ -4,14 +4,13 @@ name: Iron Semi-Binary Build - main
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   pull_request:
     branches:
-      - iron
       - master
   push:
     branches:
-      - iron
+      - master
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
@@ -23,4 +22,4 @@ jobs:
       ros_distro: iron
       ros_repo: main
       upstream_workspace: ros2_control.iron.repos
-      ref_for_scheduled_build: iron
+      ref_for_scheduled_build: master
diff --git a/.github/workflows/iron-semi-binary-build-testing.yml b/.github/workflows/iron-semi-binary-build-testing.yml
@@ -4,14 +4,13 @@ name: Iron Semi-Binary Build - testing
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   pull_request:
     branches:
-      - iron
       - master
   push:
     branches:
-      - iron
+      - master
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 1 * * *'
@@ -23,4 +22,4 @@ jobs:
       ros_distro: iron
       ros_repo: testing
       upstream_workspace: ros2_control.iron.repos
-      ref_for_scheduled_build: iron
+      ref_for_scheduled_build: master
diff --git a/.github/workflows/iron-source-build.yml b/.github/workflows/iron-source-build.yml
@@ -2,10 +2,9 @@ name: Iron Source Build
 on:
   workflow_dispatch:
     branches:
-      - iron
+      - master
   push:
     branches:
-      - iron
       - master
   schedule:
     # Run every day to detect flakiness and broken dependencies
@@ -16,5 +15,5 @@ jobs:
     uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
     with:
       ros_distro: iron
-      ref: iron
+      ref: master
       ros2_repo_branch: iron