From 57ea9692cc8b4481c60783ef35cf615ed472de40 Mon Sep 17 00:00:00 2001
From: Jesper Dramsch <jesper.dramsch@ecmwf.int>
Date: Mon, 30 Sep 2024 17:56:44 +0200
Subject: [PATCH] Small CI upgrades (#54)

* ci: switch changelog update to workflow run

* docs: changelog

* ci: expand python versions

* ci: Caution in merge body

* ci: Stronger message
---
 .github/workflows/changelog-release-update.yml | 14 ++++++++++++--
 .github/workflows/python-publish.yml           |  2 +-
 .github/workflows/python-pull-request.yml      |  5 +++++
 CHANGELOG.md                                   |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/changelog-release-update.yml b/.github/workflows/changelog-release-update.yml
index 79b85ad..b0bda9f 100644
--- a/.github/workflows/changelog-release-update.yml
+++ b/.github/workflows/changelog-release-update.yml
@@ -2,8 +2,11 @@
 name: "Update Changelog"
 
 on:
-  release:
-    types: [released]
+  workflow_run:
+    workflows:
+      - Upload Python Package
+    types:
+      - completed
 
 permissions:
   pull-requests: write
@@ -12,6 +15,7 @@ permissions:
 jobs:
   update:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
     - name: Checkout code
@@ -29,6 +33,12 @@ jobs:
       uses: peter-evans/create-pull-request@v6
       with:
         branch: docs/changelog-update-${{ github.event.release.tag_name }}
+        base: develop
         title: '[Changelog] Update to ${{ github.event.release.tag_name }}'
+        body: |
+          This PR updates the changelog to include the changes in the latest release.
+
+          > [!CAUTION]
+          > Merge DO NOT squash to correctly update the tag version of `develop` branch.
         add-paths: |
           CHANGELOG.md
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 2cb554a..2c28139 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -16,7 +16,7 @@ jobs:
   checks:
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.x"]
     uses: ecmwf-actions/reusable-workflows/.github/workflows/qa-pytest-pyproject.yml@v2
     with:
       python-version: ${{ matrix.python-version }}
diff --git a/.github/workflows/python-pull-request.yml b/.github/workflows/python-pull-request.yml
index 3488f55..4b58b12 100644
--- a/.github/workflows/python-pull-request.yml
+++ b/.github/workflows/python-pull-request.yml
@@ -16,4 +16,9 @@ jobs:
       skip-hooks: "no-commit-to-branch"
 
   checks:
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.x"]
     uses: ecmwf-actions/reusable-workflows/.github/workflows/qa-pytest-pyproject.yml@v2
+    with:
+      python-version: ${{ matrix.python-version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1599c9..68106af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Keep it human-readable, your future self will thank you!
 
 ### Changed
 - Bugfixes for CI
+- Change Changelog CI to run after successful publish
 - pytest for downstream-ci-hpc
 
 ### Removed