From adaaf911490add765a6785c71ce9d6c615427cd3 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 7 Feb 2024 10:13:49 -0600
Subject: [PATCH] Switch to workflow_call for GitHub Actions CI

---
 .github/workflows/bootstrap.yaml | 50 +++++++++++++++++++++++++++
 .github/workflows/ci.yaml        | 59 +++-----------------------------
 2 files changed, 54 insertions(+), 55 deletions(-)
 create mode 100644 .github/workflows/bootstrap.yaml

diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
new file mode 100644
index 00000000..27a6b781
--- /dev/null
+++ b/.github/workflows/bootstrap.yaml
@@ -0,0 +1,50 @@
+name: Run bootstrap tests
+
+on:
+  workflow_call:
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      strategy: ${{steps.load.outputs.strategy}}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: colcon/ci
+      - id: load
+        run: echo "strategy=$(jq -c -M '.' strategy.json)" >> $GITHUB_OUTPUT
+
+  bootstrap:
+    needs: [setup]
+    strategy: ${{ fromJson(needs.setup.outputs.strategy) }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{matrix.python}}
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip setuptools
+          python -m pip install -U -e .[test]
+          python -m pip uninstall -y colcon-core
+      - name: Build and test
+        run: |
+          cd ..
+          python ${{ github.workspace }}/bin/colcon build --paths ${{ github.workspace }}
+          python ${{ github.workspace }}/bin/colcon test --paths ${{ github.workspace }} --return-code-on-test-failure
+      - name: Use the installed package (Bash)
+        if: ${{runner.os != 'windows'}}
+        shell: bash
+        run: |
+          . ../install/local_setup.sh
+          colcon --help
+      - name: Use the installed package (CMD)
+        if: ${{runner.os == 'windows'}}
+        shell: cmd
+        run: |
+          call ..\install\local_setup.bat
+          colcon --help
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 75aa1048..a7045278 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,60 +6,9 @@ on:
   pull_request:
 
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    outputs:
-      strategy: ${{steps.load.outputs.strategy}}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: colcon/ci
-      - id: load
-        run: echo "strategy=$(echo $(cat strategy.json))" >> $GITHUB_OUTPUT
-
   pytest:
-    needs: [setup]
-    strategy: ${{fromJson(needs.setup.outputs.strategy)}}
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{matrix.python}}
-      - uses: colcon/ci@v1
-      - uses: codecov/codecov-action@v3
-
+    uses: colcon/ci/.github/workflows/pytest.yaml@main
+    with:
+      codecov: true
   bootstrap:
-    needs: [setup]
-    strategy: ${{fromJson(needs.setup.outputs.strategy)}}
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{matrix.python}}
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip setuptools
-          python -m pip install -U -e .[test]
-          python -m pip uninstall -y colcon-core
-      - name: Build and test
-        run: |
-          cd ..
-          python ${{github.workspace}}/bin/colcon build --paths ${{github.workspace}}
-          python ${{github.workspace}}/bin/colcon test --paths ${{github.workspace}} --return-code-on-test-failure
-      - name: Use the installed package (Bash)
-        if: ${{runner.os != 'windows'}}
-        shell: bash
-        run: |
-          . ../install/local_setup.sh
-          colcon --help
-      - name: Use the installed package (CMD)
-        if: ${{runner.os == 'windows'}}
-        shell: cmd
-        run: |
-          call ..\install\local_setup.bat
-          colcon --help
+    uses: ./.github/workflows/bootstrap.yaml