From bd453e5975ae9ba4751269cc8a749dbe712090fc Mon Sep 17 00:00:00 2001 From: James Rosewell Date: Tue, 3 Nov 2026 16:32:27 +0000 Subject: [PATCH] Test the Python consumer from 51degrees-python pipeline-python has moved into 51degrees-python, where the Pipeline API packages are under pipeline/. Check out the monorepo with only its direct submodules, so the cxx data files are not fetched, and swap the template in at its new path. --- .github/workflows/consumer-tests.yml | 18 ++++++++++-------- README.md | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/consumer-tests.yml b/.github/workflows/consumer-tests.yml index 5783b8e..e013a10 100644 --- a/.github/workflows/consumer-tests.yml +++ b/.github/workflows/consumer-tests.yml @@ -37,7 +37,7 @@ on: required: false default: main pipeline-python-ref: - description: Branch, tag or SHA of pipeline-python to test against + description: Branch, tag or SHA of 51degrees-python to test against required: false default: main pipeline-php-core-ref: @@ -218,7 +218,7 @@ jobs: npx jest tests/javascriptbuilder.test.js pipeline-python: - name: pipeline-python JavaScript builder + name: 51degrees-python JavaScript builder runs-on: ubuntu-latest steps: - name: Check out the template under review @@ -226,25 +226,27 @@ jobs: with: path: template - - name: Check out pipeline-python + - name: Check out 51degrees-python uses: actions/checkout@v4 with: - repository: 51Degrees/pipeline-python + repository: 51Degrees/51degrees-python ref: ${{ inputs.pipeline-python-ref || 'main' }} - submodules: recursive + # The Pipeline API packages are under pipeline/ and need only the + # direct submodules, not the data files under cxx/. + submodules: true path: consumer - name: Swap in the template under review run: | set -euo pipefail - dest=consumer/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates + dest=consumer/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates if [ ! -d "$dest" ]; then echo "::error::$dest is missing - the submodule has moved and this workflow needs updating" exit 1 fi cp template/*.mustache "$dest/" if git -C "$dest" diff --quiet; then - echo "::notice::identical to the revision pipeline-python pins, nothing swapped in" + echo "::notice::identical to the revision 51degrees-python pins, nothing swapped in" else git -C "$dest" --no-pager diff --stat fi @@ -254,7 +256,7 @@ jobs: python-version: '3.13' - name: Run the JavaScript builder tests - working-directory: consumer/fiftyone_pipeline_core + working-directory: consumer/pipeline/fiftyone_pipeline_core run: | set -euo pipefail python -m pip install --upgrade pip diff --git a/README.md b/README.md index 374cc50..4d21087 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ This repo is not a stand-alone package, but is shipped as part of and used by ea - [pipeline-dotnet](https://github.com/51Degrees/pipeline-dotnet) as a submodule - [pipeline-java](https://github.com/51Degrees/pipeline-java) as a submodule - [pipeline-node](https://github.com/51Degrees/pipeline-node) as a submodule -- [pipeline-python](https://github.com/51Degrees/pipeline-python) as a submodule +- [51degrees-python](https://github.com/51Degrees/51degrees-python) as a submodule, under `pipeline/` - [pipeline-php-core](https://github.com/51Degrees/pipeline-php-core) as a static dependency Wherever it is a submodule it will be updated by `Nightly Submodule Update` action, wherever it is a static dependency it will be updated by the `Nightly Package Update` action within a target repository.