From 18f6345a61113704ce897b460293091e450df365 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:16:04 +0000
Subject: [PATCH] chore: release v2.9.4 (#3730)

* fix: properly remove activities in workflow remove if catalog is corrupt (#3729)

* chore: release v2.9.4

* Update CHANGES.rst

---------
---
 CHANGES.rst                                      | 10 ++++++++++
 helm-chart/renku-core/Chart.yaml                 |  2 +-
 helm-chart/renku-core/values.yaml                |  2 +-
 renku/infrastructure/gateway/activity_gateway.py |  4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 83c8988837..958edd338d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -18,6 +18,16 @@
 Changes
 =======
 
+`2.9.4 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.9.3...v2.9.4>`__ (2024-07-12)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  properly remove activities in workflow remove if catalog is corrupt
+   (`#3729 <https://github.com/SwissDataScienceCenter/renku-python/issues/3729>`__)
+   (`b2418a1 <https://github.com/SwissDataScienceCenter/renku-python/commit/b2418a15c89e16e4442a1ecf11f703f4e15922e8>`__)
+
 `2.9.3 <https://github.com/SwissDataScienceCenter/renku-python/compare/v2.9.2...v2.9.3>`__ (2024-04-08)
 -------------------------------------------------------------------------------------------------------
 
diff --git a/helm-chart/renku-core/Chart.yaml b/helm-chart/renku-core/Chart.yaml
index f6154349de..d14b66054a 100644
--- a/helm-chart/renku-core/Chart.yaml
+++ b/helm-chart/renku-core/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: renku-core
 icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
-version: 2.9.3
+version: 2.9.4
diff --git a/helm-chart/renku-core/values.yaml b/helm-chart/renku-core/values.yaml
index 17357c2c59..aefe4ab5e4 100644
--- a/helm-chart/renku-core/values.yaml
+++ b/helm-chart/renku-core/values.yaml
@@ -8,4 +8,4 @@ global:
 versions:
   latest:
     image:
-      tag: v2.9.3
+      tag: v2.9.4
diff --git a/renku/infrastructure/gateway/activity_gateway.py b/renku/infrastructure/gateway/activity_gateway.py
index 7e8d970890..d9f24ddf75 100644
--- a/renku/infrastructure/gateway/activity_gateway.py
+++ b/renku/infrastructure/gateway/activity_gateway.py
@@ -272,6 +272,10 @@ def _index_activity(activity: Activity, database: Database):
 
 def _unindex_activity(activity: Activity, database: Database):
     """Add an activity to database indexes and create its up/downstream relations."""
+    # there are cases where the activity catalog can be corrupt and removing activities doesn't actually remove them
+    # here we reindex them so removal works as expected
+    reindex_catalog(database)
+
     upstreams = set()
     downstreams = set()