From 06c507c02f2b69a178af40af30b6c21b62cd877a Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Tue, 25 Mar 2025 13:10:19 -0500
Subject: [PATCH] New release v2.18.4 (#84892)

---
 changelogs/CHANGELOG-v2.18.rst           |  6 +++---
 changelogs/changelog.yaml                | 11 +++++++++++
 changelogs/fragments/2.18.4_summary.yaml |  3 +++
 lib/ansible/release.py                   |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/fragments/2.18.4_summary.yaml

diff --git a/changelogs/CHANGELOG-v2.18.rst b/changelogs/CHANGELOG-v2.18.rst
index 82a6e7abc2c..44bcfa22748 100644
--- a/changelogs/CHANGELOG-v2.18.rst
+++ b/changelogs/CHANGELOG-v2.18.rst
@@ -4,13 +4,13 @@ ansible-core 2.18 "Fool in the Rain" Release Notes
 
 .. contents:: Topics
 
-v2.18.4rc1
-==========
+v2.18.4
+=======
 
 Release Summary
 ---------------
 
-| Release Date: 2025-03-17
+| Release Date: 2025-03-25
 | `Porting Guide <https://docs.ansible.com/ansible-core/2.18/porting_guides/porting_guide_core_2.18.html>`__
 
 Bugfixes
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 8104e152662..50c2487ea3e 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -743,6 +743,17 @@ releases:
     - ansible-test-curl.yml
     - fix-include_vars-reserved-warning.yml
     release_date: '2025-02-17'
+  2.18.4:
+    changes:
+      release_summary: '| Release Date: 2025-03-25
+
+        | `Porting Guide <https://docs.ansible.com/ansible-core/2.18/porting_guides/porting_guide_core_2.18.html>`__
+
+        '
+    codename: Fool in the Rain
+    fragments:
+    - 2.18.4_summary.yaml
+    release_date: '2025-03-25'
   2.18.4rc1:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/2.18.4_summary.yaml b/changelogs/fragments/2.18.4_summary.yaml
new file mode 100644
index 00000000000..b2280e03280
--- /dev/null
+++ b/changelogs/fragments/2.18.4_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2025-03-25
+   | `Porting Guide <https://docs.ansible.com/ansible-core/2.18/porting_guides/porting_guide_core_2.18.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 030f539bd7a..1f51185697c 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.18.4rc1.post0'
+__version__ = '2.18.4'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Fool in the Rain"