From c2e0efdc7d92f8eb5b88e95e65950b1deaa7e7f2 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Fri, 25 Aug 2023 16:08:59 +0200
Subject: [PATCH] Merge python-ci job into main ci job

---
 .github/workflows/ci-python.yml | 50 ---------------------------------
 .github/workflows/ci.yml        | 34 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/ci-python.yml

diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
deleted file mode 100644
index 7ea6f595..00000000
--- a/.github/workflows/ci-python.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: CI-python
-
-# Filter CI as this job will take time.
-on:
-  push:
-    paths:
-      - apis/python/**
-      - binaries/runtime/**
-      - examples/python-dataflow/**
-      - examples/python-operator-dataflow/**
-  pull_request:
-  workflow_dispatch:
-
-env:
-  RUST_LOG: trace
-
-jobs:
-  examples:
-    name: "Python Examples"
-    strategy:
-      matrix:
-        platform: [ubuntu-latest, macos-latest]
-      fail-fast: false
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-
-      - uses: r7kamura/rust-problem-matchers@v1.1.0
-      - run: cargo --version --verbose
-      - uses: Swatinem/rust-cache@v2
-
-      - name: "Python Dataflow example"
-        run: cargo run --example python-dataflow
-
-      - name: "Python Operator Dataflow example"
-        run: cargo run --example python-operator-dataflow
-
-      - uses: ros-tooling/setup-ros@v0.6
-        with:
-          required-ros-distributions: humble
-      - run: 'source /opt/ros/humble/setup.bash && echo AMENT_PREFIX_PATH=${AMENT_PREFIX_PATH} >> "$GITHUB_ENV"'
-      - name: "python-ros2-dataflow"
-        timeout-minutes: 30
-        run: |
-          source /opt/ros/humble/setup.bash && ros2 run turtlesim turtlesim_node &
-          cargo run --example python-ros2-dataflow --features="ros2-examples"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00896cb7..de78b9da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -176,3 +176,37 @@ jobs:
       - run: cargo install cargo-lichking
       - name: "Check dependency licenses"
         run: cargo lichking check
+
+  python-examples:
+    name: "Python Examples"
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest]
+      fail-fast: false
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.10"
+
+      - uses: r7kamura/rust-problem-matchers@v1.1.0
+      - run: cargo --version --verbose
+      - uses: Swatinem/rust-cache@v2
+
+      - name: "Python Dataflow example"
+        run: cargo run --example python-dataflow
+
+      - name: "Python Operator Dataflow example"
+        run: cargo run --example python-operator-dataflow
+
+      - uses: ros-tooling/setup-ros@v0.6
+        with:
+          required-ros-distributions: humble
+      - run: 'source /opt/ros/humble/setup.bash && echo AMENT_PREFIX_PATH=${AMENT_PREFIX_PATH} >> "$GITHUB_ENV"'
+      - name: "python-ros2-dataflow"
+        timeout-minutes: 30
+        run: |
+          source /opt/ros/humble/setup.bash && ros2 run turtlesim turtlesim_node &
+          cargo run --example python-ros2-dataflow --features="ros2-examples"