From 6d2a73018f3852e359f796b329731d8210e74f8a Mon Sep 17 00:00:00 2001
From: keewis <keewis@users.noreply.github.com>
Date: Wed, 19 May 2021 16:14:45 +0200
Subject: [PATCH] fix the upstream-dev CI (#5343)

* try to get the upstream-dev back to run on scheduled events

* [test-upstream]

* [skip-ci] [test-upstream]

* [skip-ci]

* xfail the failing CFTimeIndex tests with nc-time-axis installed

* [test-upstream]
---
 .github/workflows/upstream-dev-ci.yaml | 7 +++++--
 xarray/tests/test_plot.py              | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
index a903a14acbc..2d24df2921a 100644
--- a/.github/workflows/upstream-dev-ci.yaml
+++ b/.github/workflows/upstream-dev-ci.yaml
@@ -33,8 +33,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: detect-ci-trigger
     if: |
-        (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-        || needs.detect-ci-trigger.outputs.triggered == 'true'
+        always()
+        && (
+            (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+            || needs.detect-ci-trigger.outputs.triggered == 'true'
+        )
     defaults:
       run:
         shell: bash -l {0}
diff --git a/xarray/tests/test_plot.py b/xarray/tests/test_plot.py
index e71bcaa359c..847c4aad0bf 100644
--- a/xarray/tests/test_plot.py
+++ b/xarray/tests/test_plot.py
@@ -2580,6 +2580,7 @@ def test_datetime_line_plot(self):
         self.darray.plot.line()
 
 
+@pytest.mark.xfail(reason="recent versions of nc-time-axis and cftime are incompatible")
 @pytest.mark.filterwarnings("ignore:setting an array element with a sequence")
 @requires_nc_time_axis
 @requires_cftime