From 67833a6bce5d48fc8846c7c43561cae3ff2531cd Mon Sep 17 00:00:00 2001
From: Guillaume Maze <gmaze@ifremer.fr>
Date: Wed, 16 Oct 2024 16:26:34 +0200
Subject: [PATCH 1/2] [skip-ci]

---
 .github/workflows/pytests-upstream-xarray.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pytests-upstream-xarray.yml b/.github/workflows/pytests-upstream-xarray.yml
index 59ba51b3..901fb53d 100644
--- a/.github/workflows/pytests-upstream-xarray.yml
+++ b/.github/workflows/pytests-upstream-xarray.yml
@@ -60,6 +60,7 @@ jobs:
           environment-name: argopy-tests
           environment-file: ${{ env.CONDA_ENV_FILE }}
           init-shell: bash
+          cache-environment: true
           cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
           create-args: >-
             python=${{matrix.python-version}}

From 5b34e6eb5c9fadfb902f45aeb70c6bb6179c2518 Mon Sep 17 00:00:00 2001
From: Guillaume Maze <gmaze@ifremer.fr>
Date: Wed, 16 Oct 2024 16:38:16 +0200
Subject: [PATCH 2/2] Fix workflows [skip-ci]

---
 .github/workflows/pytests-upstream-xarray.yml | 4 ++--
 .github/workflows/pytests-upstream.yml        | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pytests-upstream-xarray.yml b/.github/workflows/pytests-upstream-xarray.yml
index 901fb53d..41e9caa2 100644
--- a/.github/workflows/pytests-upstream-xarray.yml
+++ b/.github/workflows/pytests-upstream-xarray.yml
@@ -79,16 +79,16 @@ jobs:
         run: |
           pytest -ra -v -s -c argopy/tests/pytest.ini --durations=10 \
             --report-log output-${{ matrix.python-version }}-log.jsonl \
-            test_fetchers_data_erddap.py
+            argopy/tests/test_fetchers_data_erddap.py
 
       - name: Generate and publish a report on failure
         if: |
           failure()
-          && steps.status.outcome == 'failure'
           && github.repository_owner == 'euroargodev'
         uses: xarray-contrib/issue-from-pytest-log@main
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl
+          issue-title: "Xarray > 2024.3 CI failed"
 
       - name: Save tests log as artifact
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/pytests-upstream.yml b/.github/workflows/pytests-upstream.yml
index ba9c463e..e9b336d5 100644
--- a/.github/workflows/pytests-upstream.yml
+++ b/.github/workflows/pytests-upstream.yml
@@ -158,12 +158,12 @@ jobs:
       - name: Generate and publish a report on failure
         if: |
           failure()
-          && steps.status.outcome == 'failure'
           && github.repository_owner == 'euroargodev'
         uses: xarray-contrib/issue-from-pytest-log@main
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl
-          
+          issue-title: "Upstream CI tests failed: Core - Free - Py${{matrix.python-version}} - ${{ matrix.os }}"
+
       - name: Save tests log as artifact
         uses: actions/upload-artifact@v4
         with:
@@ -291,7 +291,8 @@ jobs:
         uses: xarray-contrib/issue-from-pytest-log@main
         with:
           log-path: output-${{ matrix.python-version }}-log.jsonl
-          
+          issue-title: "Upstream CI tests failed: All - Free - Py${{matrix.python-version}} - ${{ matrix.os }}"
+
       - name: Save tests log as artifact
         uses: actions/upload-artifact@v4
         with: