From ce6e5d91004b467830d326b441af6fbb53b8bb22 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 15:35:50 +0200
Subject: [PATCH 01/21] use micromamba instead of mamba

---
 .github/workflows/ci.yaml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 20f876b52fc..2f9f87ea2b9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -83,25 +83,12 @@ jobs:
 
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
-      - name: Cache conda
-        uses: actions/cache@v3
+      - name: Setup micromamba
+        uses: mamba-org/provision-with-micromamba
         with:
-          path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{ hashFiles('ci/requirements/**.yml') }}-${{ matrix.env }}
-
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: ${{ matrix.python-version }}
-          use-only-tar-bz2: true
-
-      - name: Install conda dependencies
-        run: |
-          mamba env update -f $CONDA_ENV_FILE
+          environment-file: $CONDA_ENV_FILE
+          environment-name: xarray-tests
+          cache-env: true
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

From f9a4fd3df7f7ff198c2dee8fcff15448f4ca83a4 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 15:41:21 +0200
Subject: [PATCH 02/21] specify the version of the micromamba GA

---
 .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 2f9f87ea2b9..4006f64f731 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -84,7 +84,7 @@ jobs:
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba
+        uses: mamba-org/provision-with-micromamba@v11
         with:
           environment-file: $CONDA_ENV_FILE
           environment-name: xarray-tests

From 99af0b05122b47df3db4345766b885cd3a8d8d55 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 15:44:26 +0200
Subject: [PATCH 03/21] use a commit hash instead, cache-env has never been
 released yet

---
 .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 4006f64f731..e8c59e0e67f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -84,7 +84,7 @@ jobs:
           echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
 
       - name: Setup micromamba
-        uses: mamba-org/provision-with-micromamba@v11
+        uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
           environment-file: $CONDA_ENV_FILE
           environment-name: xarray-tests

From fcc6931e00dd2555d827060554c367eebc75848e Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 15:47:09 +0200
Subject: [PATCH 04/21] properly access the environment variable

---
 .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 e8c59e0e67f..215e56bccf2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -86,7 +86,7 @@ jobs:
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          environment-file: $CONDA_ENV_FILE
+          environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: xarray-tests
           cache-env: true
 

From 9e432f3dc11ff03131039de783938edf619e802a Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:18:26 +0200
Subject: [PATCH 05/21] use micromamba in the additional CI

---
 .github/workflows/ci-additional.yaml | 58 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index ff3e8ab7e63..f51fd7188b2 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -43,18 +43,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
-      - uses: conda-incubator/setup-miniconda@v2
+
+      - name: Setup micromamba
+        uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: "3.9"
+          environment-file: ci/requirements/environment.yml
+          environment-name: xarray-tests
+          extra-specs: |
+            python=3.10
+          cache-env: true
 
-      - name: Install conda dependencies
-        run: |
-          mamba env update -f ci/requirements/environment.yml
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
@@ -81,18 +79,14 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
-      - uses: conda-incubator/setup-miniconda@v2
+      - name: Setup micromamba
+        uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: "3.9"
-
-      - name: Install conda dependencies
-        run: |
-          mamba env update -f ci/requirements/environment.yml
+          environment-file: ci/requirements/environment.yml
+          environment-name: xarray-tests
+          extra-specs: |
+            python=3.10
+          cache-env: true
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
@@ -118,20 +112,24 @@ jobs:
       run:
         shell: bash -l {0}
 
+    matrix:
+      environment-file: ["bare-minimum", "min-all-deps"]
+
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
-      - uses: conda-incubator/setup-miniconda@v2
+
+      - name: Setup micromamba
+        uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          auto-update-conda: false
-          python-version: "3.9"
+          extra-specs: |
+            python=3.10
+            pyyaml
+            conda
+            python-dateutil
+          cache-env: true
 
       - name: minimum versions policy
         run: |
-          mamba install -y pyyaml conda python-dateutil
-          python ci/min_deps_check.py ci/requirements/bare-minimum.yml
-          python ci/min_deps_check.py ci/requirements/min-all-deps.yml
+          python ci/min_deps_check.py ci/requirements/${{ matrix.environment-file }}.yml

From 5c96ab7ddf368916f58866f281e7533f07f5f4d2 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:20:36 +0200
Subject: [PATCH 06/21] uses micromamba in the upstream-dev CI [test-upstream]

---
 .github/workflows/upstream-dev-ci.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
index 81d1c7db4b8..bc05d732041 100644
--- a/.github/workflows/upstream-dev-ci.yaml
+++ b/.github/workflows/upstream-dev-ci.yaml
@@ -55,17 +55,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xarray-tests
-          auto-update-conda: false
-          python-version: ${{ matrix.python-version }}
       - name: Set up conda environment
+        uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
+        with:
+          environment-file: ci/requirements/environment.yml
+          environment-name: xarray-tests
+          extra-specs: |
+            python=${{ matrix.python-version }}
+          cache-env: true
+      - name: Install upstream versions
         run: |
-          mamba env update -f ci/requirements/environment.yml
           bash ci/install-upstream-wheels.sh
       - name: Install xarray
         run: |

From 484dab4af123a8a99858318d5074207d3c46fb6f Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:26:12 +0200
Subject: [PATCH 07/21] synchronise the minimum tested pandas version with
 setup.cfg

---
 ci/requirements/bare-minimum.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/requirements/bare-minimum.yml b/ci/requirements/bare-minimum.yml
index 5986ec7186b..8bc069528d5 100644
--- a/ci/requirements/bare-minimum.yml
+++ b/ci/requirements/bare-minimum.yml
@@ -12,4 +12,4 @@ dependencies:
   - pytest-xdist
   - numpy=1.18
   - packaging=20.0
-  - pandas=1.1
+  - pandas=1.2

From 9e5187df37a34b6797b5a9fc90a66c0b9a3e32fd Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:28:22 +0200
Subject: [PATCH 08/21] fix the workflow

---
 .github/workflows/ci-additional.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index f51fd7188b2..61d2003c319 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -112,8 +112,10 @@ jobs:
       run:
         shell: bash -l {0}
 
-    matrix:
-      environment-file: ["bare-minimum", "min-all-deps"]
+    strategy:
+      matrix:
+        environment-file: ["bare-minimum", "min-all-deps"]
+      fail-fast: false
 
     steps:
       - uses: actions/checkout@v3

From 28d6a10cb833e807f49fcc9aba3884810841aa9d Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:30:31 +0200
Subject: [PATCH 09/21] try if removing the environment cache works [skip-ci]

---
 .github/workflows/ci-additional.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 61d2003c319..c7b8e78ad19 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -130,7 +130,6 @@ jobs:
             pyyaml
             conda
             python-dateutil
-          cache-env: true
 
       - name: minimum versions policy
         run: |

From 51962285f0fcd651aea01e45ef0bd6646044ed7b Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:31:18 +0200
Subject: [PATCH 10/21] synchronise the minimum numpy version

---
 ci/requirements/bare-minimum.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/requirements/bare-minimum.yml b/ci/requirements/bare-minimum.yml
index 8bc069528d5..cb5bfa05006 100644
--- a/ci/requirements/bare-minimum.yml
+++ b/ci/requirements/bare-minimum.yml
@@ -10,6 +10,6 @@ dependencies:
   - pytest-cov
   - pytest-env
   - pytest-xdist
-  - numpy=1.18
+  - numpy=1.19
   - packaging=20.0
   - pandas=1.2

From e338ee5f762df19d24d4b620203edf2732ef760b Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:45:54 +0200
Subject: [PATCH 11/21] don't cache the upstream-dev environment
 [test-upstream]

---
 .github/workflows/upstream-dev-ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
index bc05d732041..b37ec390a71 100644
--- a/.github/workflows/upstream-dev-ci.yaml
+++ b/.github/workflows/upstream-dev-ci.yaml
@@ -62,7 +62,6 @@ jobs:
           environment-name: xarray-tests
           extra-specs: |
             python=${{ matrix.python-version }}
-          cache-env: true
       - name: Install upstream versions
         run: |
           bash ci/install-upstream-wheels.sh

From f4271baf67c4f9963f55fcf4a84db9684d8de545 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 16:58:03 +0200
Subject: [PATCH 12/21] specify the environment name and don't use a file
 [skip-ci]

---
 .github/workflows/ci-additional.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index c7b8e78ad19..72cd9e7aa2c 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -125,6 +125,8 @@ jobs:
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
+          environment-name: xarray-tests
+          environment-file: false
           extra-specs: |
             python=3.10
             pyyaml

From 3a82515fd0a1cbc3db9dd5f2d92bb811e90a26c0 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 17:01:13 +0200
Subject: [PATCH 13/21] trigger ci


From d74796625370b4e705e47d84905d8002c7b25e20 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 17:03:23 +0200
Subject: [PATCH 14/21] use conda-forge

---
 .github/workflows/ci-additional.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 72cd9e7aa2c..18335c222e2 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -132,6 +132,7 @@ jobs:
             pyyaml
             conda
             python-dateutil
+          channels: conda-forge
 
       - name: minimum versions policy
         run: |

From b2b5316044bccf1ba7f334d97f52764515f5fff5 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 17:57:11 +0200
Subject: [PATCH 15/21] set manual cache keys

---
 .github/workflows/ci-additional.yaml | 10 +++++++++-
 .github/workflows/ci.yaml            |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 18335c222e2..dc65733266a 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -39,19 +39,26 @@ jobs:
       run:
         shell: bash -l {0}
 
+    env:
+      CONDA_ENV_FILE: ci/requirements/environment.yml
+
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
+      - run: |
+          echo "TODAY=$(date -s %Y-%m-%d)" >> $GITHUB_ENV
+
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          environment-file: ci/requirements/environment.yml
+          environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
             python=3.10
           cache-env: true
+          cache-env-key: "${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
 
       - name: Install xarray
         run: |
@@ -87,6 +94,7 @@ jobs:
           extra-specs: |
             python=3.10
           cache-env: true
+          cache-env-key: ${{runner.os}}-${{runner.arch}} ${{today()}} mypy
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 215e56bccf2..caf89faf343 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -65,6 +65,8 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set environment variables
         run: |
+          echo "TODAY=$(date -s "%Y-%m-%d)" >> $GITHUB_ENV
+
           if [[ ${{ matrix.os }} == windows* ]] ;
           then
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
@@ -89,6 +91,7 @@ jobs:
           environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: xarray-tests
           cache-env: true
+          cache-env-key: ${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

From 7d09d0b3ea4a95de9b15bc4d9c618959484f477d Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 21:57:51 +0200
Subject: [PATCH 16/21] fix the mypy job's caching

---
 .github/workflows/ci-additional.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index dc65733266a..ef590e9e877 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -81,20 +81,25 @@ jobs:
     defaults:
       run:
         shell: bash -l {0}
+    env:
+      CONDA_ENV_FILE: ci/requirements/environment.yml
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
+
+      - run: |
+          echo "TODAY=$(date -s %Y-%m-%d)" >> $GITHUB_ENV
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
-          environment-file: ci/requirements/environment.yml
+          environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
             python=3.10
           cache-env: true
-          cache-env-key: ${{runner.os}}-${{runner.arch}} ${{today()}} mypy
+          cache-env-key: ${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .

From 5c4b95fbcf0f2734c3586806924f13108bd1dcc9 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 22:00:26 +0200
Subject: [PATCH 17/21] fix the date call

---
 .github/workflows/ci-additional.yaml | 4 ++--
 .github/workflows/ci.yaml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index ef590e9e877..e495fd70506 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -48,7 +48,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
       - run: |
-          echo "TODAY=$(date -s %Y-%m-%d)" >> $GITHUB_ENV
+          echo "TODAY=$(date  +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
@@ -90,7 +90,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
       - run: |
-          echo "TODAY=$(date -s %Y-%m-%d)" >> $GITHUB_ENV
+          echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41
         with:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index caf89faf343..87c259b7dd7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -65,7 +65,7 @@ jobs:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set environment variables
         run: |
-          echo "TODAY=$(date -s "%Y-%m-%d)" >> $GITHUB_ENV
+          echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
           if [[ ${{ matrix.os }} == windows* ]] ;
           then

From 6d011e35dac1efd4a43bed49cf344b39ace93b2f Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 22:05:56 +0200
Subject: [PATCH 18/21] assign a name to the extra step to get the date

---
 .github/workflows/ci-additional.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index e495fd70506..4d114f3183d 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -47,7 +47,8 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
-      - run: |
+      - name: set environment variables
+        run: |
           echo "TODAY=$(date  +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Setup micromamba
@@ -89,7 +90,8 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
 
-      - run: |
+      - name: set environment variables
+        run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
       - name: Setup micromamba
         uses: mamba-org/provision-with-micromamba@de032af7fb3675649f3d4bbdda85178ba412ee41

From 758a631f8d4818fd0753e0f3a387dd7a52a16ec3 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Wed, 8 Jun 2022 22:22:04 +0200
Subject: [PATCH 19/21] rerun all CI [test-upstream]


From 4c4e0566a3bea7f5e6ce3161f1a20a8dd1c94355 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Thu, 9 Jun 2022 10:41:09 +0200
Subject: [PATCH 20/21] include the python version in the cache key

---
 .github/workflows/ci-additional.yaml | 10 ++++++----
 .github/workflows/ci.yaml            |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 4d114f3183d..5636f5d99c3 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -41,6 +41,7 @@ jobs:
 
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
+      PYTHON_VERSION: "3.10"
 
     steps:
       - uses: actions/checkout@v3
@@ -57,9 +58,9 @@ jobs:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
-            python=3.10
+            python=${{env.PYTHON_VERSION}}
           cache-env: true
-          cache-env-key: "${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
+          cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
 
       - name: Install xarray
         run: |
@@ -84,6 +85,7 @@ jobs:
         shell: bash -l {0}
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
+      PYTHON_VERSION: "3.10"
 
     steps:
       - uses: actions/checkout@v3
@@ -99,9 +101,9 @@ jobs:
           environment-file: ${{env.CONDA_ENV_FILE}}
           environment-name: xarray-tests
           extra-specs: |
-            python=3.10
+            python=${{env.PYTHON_VERSION}}
           cache-env: true
-          cache-env-key: ${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}
+          cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
       - name: Install xarray
         run: |
           python -m pip install --no-deps -e .
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 87c259b7dd7..1d5c8ddefba 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -91,7 +91,7 @@ jobs:
           environment-file: ${{ env.CONDA_ENV_FILE }}
           environment-name: xarray-tests
           cache-env: true
-          cache-env-key: ${{runner.os}}-${{runner.arch}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}
+          cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
 
       # We only want to install this on one run, because otherwise we'll have
       # duplicate annotations.

From ab7b4b66423b25f81d039c2813a768e7a2a190c5 Mon Sep 17 00:00:00 2001
From: Keewis <keewis@posteo.de>
Date: Thu, 9 Jun 2022 13:49:28 +0200
Subject: [PATCH 21/21] rerun CI