Switch back to master branch

ros-controls · Apr 24, 2024 · 1c04b93 · 1c04b93
1 parent 8c6517a
commit 1c04b93
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   coverage:
     name: coverage build
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@revert_coverage_hack
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
     secrets: inherit
     with:
       ros_distro: rolling

diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   pre-commit:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
     strategy:
       fail-fast: false
       matrix:
@@ -18,7 +18,7 @@ jobs:
       os_name: ubuntu-22.04
 
   pre-commit-rolling:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
     with:
       ros_distro: rolling
       container: ubuntu:24.04
diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml
@@ -4,27 +4,24 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
   schedule:
     # Run every day to detect flakiness and broken dependencies
     - cron: '03 3 * * *'
 
 jobs:
-  # source:
-  #   uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       ROS_DISTRO: [iron, humble]
-  #   with:
-  #     ros_distro: ${{ matrix.ROS_DISTRO }}
-  #     ref: master
-  #     ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
-  #     os_name: ubuntu-22.04
+  source:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_DISTRO: [iron, humble]
+    with:
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ref: master
+      ros2_repo_branch: ${{ matrix.ROS_DISTRO }}
+      os_name: ubuntu-22.04
   source-rolling:
-    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@revert_coverage_hack
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
     strategy:
       fail-fast: false
       matrix: