From 6e6e1af85cd7efc6b7e696a248fdfaa1c55177d3 Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Thu, 19 Sep 2024 17:29:54 +0100
Subject: [PATCH] tidier kluge

---
 .github/workflows/ci-tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 3e53a4c1..73f4c4fc 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -33,6 +33,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         version: [py310, py311]
+        gitpath_prepend: [""]
         include:
           - os: ubuntu-latest
             platform: linux
@@ -43,6 +44,9 @@ jobs:
           - os: macos-latest
             version: py311
             platform: osx
+            # On macos, the up-to-date git may not be first on the path
+            # N.B. setting includes a final ":", to simplify the path setting command
+            gitpath_prepend: "/opt/homebrew/bin:"
     steps:
     - name: "Checkout"
       uses: actions/checkout@v4
@@ -108,9 +112,7 @@ jobs:
       env:
         POST_COMMAND: ${{ matrix.post-command }}
       run: |
-        echo $PATH
-        git --version
-        export PATH=/opt/homebrew/bin:$PATH
+        export PATH=${{ gitpath_prepend }}$PATH
         which git
         git --version
         tox -e ${{ matrix.version }}-${{ matrix.platform }}-test -- ${{ matrix.posargs }}