From ceb7c824875414c321de88ee077ea01af758caab Mon Sep 17 00:00:00 2001 From: James Bruten Date: Mon, 15 Dec 2025 11:41:06 +0000 Subject: [PATCH 1/7] add shumlib testing --- .github/workflows/ci.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a02f8b1..b383975 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,7 +28,14 @@ jobs: steps: - name: Checkout Mule - uses: actions/checkout@v4 + uses: actions/checkout@v6 + with: + path: mule + - name: Checkout Shumlib + uses: actions/checkout@v6 + with: + repository: "MetOffice/shumlib" + path: shumlib - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -39,9 +46,16 @@ jobs: pip install setuptools pip install six pip install numpy==${{ matrix.numpy-version }} + - name: Install shumlib + run: | + cd $GITHUB_WORKSPACE/shumlib + make -f ./make/vm-x86-gfortran-gcc.mk check - name: Build python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | - ./admin/install_mule.sh ./_build/lib ./_build/bin + cd $GITHUB_WORKSPACE/mule + ./admin/install_mule.sh --spiral_lib --ppibm_lib --packing_lib | + --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc | + ./_build/lib ./_build/bin - name: Test python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | cd _build/lib From de399521bd63902b33a35cd64c23e87b682cf467 Mon Sep 17 00:00:00 2001 From: James Bruten Date: Mon, 15 Dec 2025 11:46:03 +0000 Subject: [PATCH 2/7] correct multiline --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b383975..d8a6fd9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,8 +53,8 @@ jobs: - name: Build python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | cd $GITHUB_WORKSPACE/mule - ./admin/install_mule.sh --spiral_lib --ppibm_lib --packing_lib | - --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc | + ./admin/install_mule.sh --spiral_lib --ppibm_lib --packing_lib \ + --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc \ ./_build/lib ./_build/bin - name: Test python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | From fb228345163da002b7fa646392d274b7eca5b507 Mon Sep 17 00:00:00 2001 From: James Bruten Date: Mon, 15 Dec 2025 11:48:03 +0000 Subject: [PATCH 3/7] update test path --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d8a6fd9..d66717d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -58,7 +58,7 @@ jobs: ./_build/lib ./_build/bin - name: Test python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | - cd _build/lib + cd $GITHUB_WORKSPACE/mule/_build/lib for name in ./*; do python -m unittest discover -v ${name##*/}.tests done From b345d27d15842241798601112da4000a897fa40c Mon Sep 17 00:00:00 2001 From: James Bruten Date: Mon, 15 Dec 2025 13:01:27 +0000 Subject: [PATCH 4/7] remove ppibm --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d66717d..4b82d63 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - name: Build python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | cd $GITHUB_WORKSPACE/mule - ./admin/install_mule.sh --spiral_lib --ppibm_lib --packing_lib \ + ./admin/install_mule.sh --spiral_lib --packing_lib \ --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc \ ./_build/lib ./_build/bin - name: Test python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} From 82630241b030b76341b2bc53b757d9c7b1a193ab Mon Sep 17 00:00:00 2001 From: James Bruten Date: Tue, 16 Dec 2025 07:56:33 +0000 Subject: [PATCH 5/7] review comments --- .github/workflows/ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4b82d63..44acba6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,15 +48,16 @@ jobs: pip install numpy==${{ matrix.numpy-version }} - name: Install shumlib run: | + echo "Compiling shumlib using $(gfortran --version)" cd $GITHUB_WORKSPACE/shumlib make -f ./make/vm-x86-gfortran-gcc.mk check - - name: Build python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} + - name: Install Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | cd $GITHUB_WORKSPACE/mule ./admin/install_mule.sh --spiral_lib --packing_lib \ --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc \ ./_build/lib ./_build/bin - - name: Test python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} + - name: Test Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} run: | cd $GITHUB_WORKSPACE/mule/_build/lib for name in ./*; do From 5a420ff07e76a4aa51326316c47148df60018526 Mon Sep 17 00:00:00 2001 From: James Bruten Date: Wed, 17 Dec 2025 10:56:02 +0000 Subject: [PATCH 6/7] update to working-directory --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 44acba6..404d63c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,19 +47,19 @@ jobs: pip install six pip install numpy==${{ matrix.numpy-version }} - name: Install shumlib + working-directory: ${GITHUB_WORKSPACE}/shumlib run: | echo "Compiling shumlib using $(gfortran --version)" - cd $GITHUB_WORKSPACE/shumlib make -f ./make/vm-x86-gfortran-gcc.mk check - name: Install Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} + working-directory: ${GITHUB_WORKSPACE}/mule run: | - cd $GITHUB_WORKSPACE/mule ./admin/install_mule.sh --spiral_lib --packing_lib \ --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc \ ./_build/lib ./_build/bin - name: Test Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} + working-directory: ${GITHUB_WORKSPACE}/mule/_build/lib run: | - cd $GITHUB_WORKSPACE/mule/_build/lib for name in ./*; do python -m unittest discover -v ${name##*/}.tests done From 61c913fee56daae513888704ab2ec081a23fae57 Mon Sep 17 00:00:00 2001 From: James Bruten Date: Wed, 17 Dec 2025 11:02:25 +0000 Subject: [PATCH 7/7] correct working-directory --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 404d63c..edd67ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,18 +47,18 @@ jobs: pip install six pip install numpy==${{ matrix.numpy-version }} - name: Install shumlib - working-directory: ${GITHUB_WORKSPACE}/shumlib + working-directory: ./shumlib run: | echo "Compiling shumlib using $(gfortran --version)" make -f ./make/vm-x86-gfortran-gcc.mk check - name: Install Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} - working-directory: ${GITHUB_WORKSPACE}/mule + working-directory: ./mule run: | ./admin/install_mule.sh --spiral_lib --packing_lib \ --shumlib_path $GITHUB_WORKSPACE/shumlib/build/vm-x86-gfortran-gcc \ ./_build/lib ./_build/bin - name: Test Mule with python-${{ matrix.python-version }}_numpy-${{ matrix.numpy-version }} - working-directory: ${GITHUB_WORKSPACE}/mule/_build/lib + working-directory: ./mule/_build/lib run: | for name in ./*; do python -m unittest discover -v ${name##*/}.tests