From 41110795ff5c051048c9d6b2df7fa9cddad96463 Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Thu, 10 Sep 2026 10:18:22 +0200
Subject: [PATCH 1/4] Fix CircleCI pixi setup

---
 .circleci/config.yml | 54 ++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5fc6d40897..20099181da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,37 @@ version: 2.1
 
 orbs:
   codecov: codecov/codecov@6.0.0
-  pixi: prefix-dev/pixi@0.1.0
+
+commands:
+  pixi_setup:
+    # Based on https://circleci.com/developer/orbs/orb/prefix-dev/pixi, but without
+    # the issues described in https://github.com/ESMValGroup/ESMValTool/issues/4582.
+    description: "Set up a pixi environment."
+    parameters:
+      env:
+        type: string
+        default: "default"
+    steps:
+      - restore_cache:
+          keys:
+            - pixi-linux-v1-{{ arch }}-{{ checksum "pixi.lock" }}-<<parameters.env>>
+      - run:
+          name: Install pixi
+          command: |
+            set -euo pipefail
+            curl -fsSL https://pixi.sh/install.sh | sh
+            echo 'export PATH="$HOME/.pixi/bin:$PATH"' >> "$BASH_ENV"
+            source "$BASH_ENV"
+            pixi --version
+      - run:
+          name: Install pixi environment
+          command: |
+            set -euo pipefail
+            pixi install --environment "<<parameters.env>>"
+      - save_cache:
+          key: pixi-linux-v1-{{ arch }}-{{ checksum "pixi.lock" }}-<<parameters.env>>
+          paths:
+            - ~/.cache/rattler
 
 jobs:
   test:
@@ -13,7 +43,7 @@ jobs:
     resource_class: large
     steps:
       - checkout
-      - pixi/pixi_setup
+      - pixi_setup
       - run:
           name: Check dependencies are compatible
           command: pixi run --as-is pip check
@@ -33,16 +63,13 @@ jobs:
           disable_search: true
       - store_test_results:
           path: test-reports/report.xml
+      - store_artifacts:
+          path: test-reports/
       - run:
           name: Compress pytest artifacts
           command: tar -cvzf pytest.tar.gz -C /tmp/pytest-of-$(whoami)/ .
       - store_artifacts:
           path: pytest.tar.gz
-      - run:
-          name: Compress test-report artifacts
-          command: tar -cvzf test-reports.tar.gz test-reports/
-      - store_artifacts:
-          path: test-reports.tar.gz
 
   test_with_upstream_developments:
     # Test with development versions of upstream packages.
@@ -51,7 +78,7 @@ jobs:
     resource_class: large
     steps:
       - checkout
-      - pixi/pixi_setup
+      - pixi_setup
       - run:
           name: Install development versions of upstream packages
           command: |
@@ -77,16 +104,13 @@ jobs:
             pixi run --as-is esmvaltool -- --help
       - store_test_results:
           path: test-reports/report.xml
+      - store_artifacts:
+          path: test-reports/
       - run:
           name: Compress pytest artifacts
           command: tar -cvzf pytest.tar.gz -C /tmp/pytest-of-$(whoami)/ .
       - store_artifacts:
           path: pytest.tar.gz
-      - run:
-          name: Compress test-report artifacts
-          command: tar -cvzf test-reports.tar.gz test-reports/
-      - store_artifacts:
-          path: test-reports.tar.gz
 
   test_installation_from_conda:
     # Test installation from conda-forge.
@@ -109,10 +133,12 @@ jobs:
     resource_class: small
     steps:
       - checkout
-      - pixi/pixi_setup
+      - pixi_setup
       - run:
           name: Build documentation
           command: pixi run --as-is doc --fail-on-warning --show-traceback
+      - store_artifacts:
+          path: html
 
 workflows:
   commit:

From ac4bf61c478d4bb66afe7721963d390467d40d85 Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Thu, 10 Sep 2026 10:22:02 +0200
Subject: [PATCH 2/4] Run all tests

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20099181da..f455315870 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,7 +143,10 @@ jobs:
 workflows:
   commit:
     jobs:
+      - build_documentation
       - test
+      - test_installation_from_conda
+      - test_with_upstream_developments
 
   nightly:
     triggers:

From 8bbe1c3f5829a367025ee2db321cf7a5c5441155 Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Thu, 10 Sep 2026 10:37:39 +0200
Subject: [PATCH 3/4] Rerun tests


From a7856b7616c362fe1d1bc7698c4b3f8fe6877d8c Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Thu, 10 Sep 2026 10:40:44 +0200
Subject: [PATCH 4/4] Only run test job

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f455315870..20099181da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,10 +143,7 @@ jobs:
 workflows:
   commit:
     jobs:
-      - build_documentation
       - test
-      - test_installation_from_conda
-      - test_with_upstream_developments
 
   nightly:
     triggers: