From af0ef0c199691d266513434c35ea42511185f6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Wed, 9 Nov 2022 16:59:28 +0100
Subject: [PATCH] feat(ci): Always perform cleanup tasks

---
 .github/workflows/build-and-test.yml | 3 ++-
 CHANGELOG.md                         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c846f62..d22e5a4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -157,5 +157,6 @@ jobs:
         run: tests/config-reloader/test.sh
 
       - name: Cleanup
+        if: always()
         run: |
-          docker stop registry
+          docker rm --force registry
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce5756..2a55454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ for the list of changes in SaltStack.
 **3005.1_2**
 
 - CI(tests): Always run tests.
+- CI: Always perform cleanup tasks.
 - CI: Improve build times.
 
 **3005.1_1**