From 5383698c5cac7154a0a3f6a8289ff4c0512baf81 Mon Sep 17 00:00:00 2001
From: Fridolin Glatter <glatter@iiasa.ac.at>
Date: Tue, 22 Oct 2024 11:48:40 +0200
Subject: [PATCH 1/3] Upload coverage report to main directly

---
 .github/workflows/pytest.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index 0d38dadf..4935f35c 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -130,7 +130,6 @@ jobs:
         run: |
           source .venv/bin/activate
           pytest --backend ${{ matrix.backend }} --postgres-dsn "postgresql://postgres:postgres@localhost:5432/test" --cov-report xml:.coverage.xml --cov=ixmp4 -rsxX --benchmark-skip --color=yes
-
       #------------------------------
       #  Upload coverage to codecov
       #------------------------------
@@ -139,6 +138,15 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: .coverage.xml
+      #-----------------------------------
+      #  Upload coverage for `main`, too 
+      #-----------------------------------
+      - name: Upload results to Codecov for `main`
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: .coverage.xml
+          override_branch: main
 
   pre-commit:
     name: Code quality

From eeac02105235d1d28a1d0fe82a8b65158504a428 Mon Sep 17 00:00:00 2001
From: Fridolin Glatter <glatter@iiasa.ac.at>
Date: Tue, 22 Oct 2024 13:18:25 +0200
Subject: [PATCH 2/3] Run whole test suite also an pushes to main

---
 .github/workflows/pytest.yaml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index 4935f35c..cae82d03 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -1,6 +1,12 @@
 name: test
 
-on: pull_request
+# TODO workaround for Codecov/squash and merge, a bit wasteful
+# Revise e.g. via https://github.com/codecov/feedback/issues/369
+on: 
+  pull_request:
+  push:
+    branches:
+      - 'main'
 
 jobs:
   test:
@@ -138,15 +144,6 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: .coverage.xml
-      #-----------------------------------
-      #  Upload coverage for `main`, too 
-      #-----------------------------------
-      - name: Upload results to Codecov for `main`
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: .coverage.xml
-          override_branch: main
 
   pre-commit:
     name: Code quality

From d662914498ef8a083f4c901eb84b4803aaf06015 Mon Sep 17 00:00:00 2001
From: Fridolin Glatter <glatter@iiasa.ac.at>
Date: Wed, 30 Oct 2024 11:16:32 +0100
Subject: [PATCH 3/3] Remove outdated workflow

---
 .github/workflows/build-docs.yaml | 65 -------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 .github/workflows/build-docs.yaml

diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
deleted file mode 100644
index 57399cce..00000000
--- a/.github/workflows/build-docs.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: build the docs
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["**"]
-
-jobs:
-  build-docs:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-
-    steps:
-      #------------------------------------
-      #  check-out repo and set-up python
-      #------------------------------------
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up python
-        id: setup-python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      #------------------------------
-      #  install & configure poetry
-      #------------------------------
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
-
-      #----------------------------------
-      #  install dynamic version plugin
-      #----------------------------------
-      - name: Install poetry-dynamic-versioning
-        run: poetry self add "poetry-dynamic-versioning[plugin]"
-
-      #------------------------------------
-      #  load cached venv if cache exists
-      #------------------------------------
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
-
-      #------------------------
-      #  install root project
-      #------------------------
-      - name: Install library
-        run: poetry install --no-interaction --with docs,dev,server
-
-      #------------------
-      #  build the docs
-      #------------------
-      - name: Build the docs
-        run: poetry run make --directory=doc html