From c016b4d6cada0c317fb587fb48f3179c53e963d5 Mon Sep 17 00:00:00 2001
From: Ken Celenza <ken@celenza.org>
Date: Tue, 16 Jul 2024 16:49:39 -0400
Subject: [PATCH] Prep 2.1.1 (#782)

---
 .github/workflows/ci.yml                |  4 ++--
 changes/769.dependencies                |  1 -
 changes/769.housekeeping                |  1 -
 changes/771.documentation               |  1 -
 changes/773.fixed                       |  1 -
 changes/775.documentation               |  1 -
 changes/776.documentation               |  1 -
 docs/admin/release_notes/version_2.1.md | 21 +++++++++++++++++++++
 pyproject.toml                          |  2 +-
 9 files changed, 24 insertions(+), 9 deletions(-)
 delete mode 100644 changes/769.dependencies
 delete mode 100644 changes/769.housekeeping
 delete mode 100644 changes/771.documentation
 delete mode 100644 changes/773.fixed
 delete mode 100644 changes/775.documentation
 delete mode 100644 changes/776.documentation

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f3c9bec..a02a72ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,9 +191,9 @@ jobs:
       - name: "Run Tests"
         run: "poetry run invoke unittest"
   changelog:
-    if: |
+    if: >
       contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) &&
-      (github.head_ref != 'main')
+      (github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
     runs-on: "ubuntu-22.04"
     steps:
       - name: "Check out repository code"
diff --git a/changes/769.dependencies b/changes/769.dependencies
deleted file mode 100644
index 449a1137..00000000
--- a/changes/769.dependencies
+++ /dev/null
@@ -1 +0,0 @@
-Updated django-pivot to ~1.9.0.
diff --git a/changes/769.housekeeping b/changes/769.housekeeping
deleted file mode 100644
index 624c7bfb..00000000
--- a/changes/769.housekeeping
+++ /dev/null
@@ -1 +0,0 @@
-Added view tests for ConfigComplianceUIViewSet.
diff --git a/changes/771.documentation b/changes/771.documentation
deleted file mode 100644
index ad7e37fe..00000000
--- a/changes/771.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Updated navigation tree for documentation updates for 2.1 release notes and XML compliance.
\ No newline at end of file
diff --git a/changes/773.fixed b/changes/773.fixed
deleted file mode 100644
index e8d14c9a..00000000
--- a/changes/773.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Fixed deepdiff dependency range
\ No newline at end of file
diff --git a/changes/775.documentation b/changes/775.documentation
deleted file mode 100644
index df9a283e..00000000
--- a/changes/775.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Add FAQ for deepdiff and numpy dependency issue.
\ No newline at end of file
diff --git a/changes/776.documentation b/changes/776.documentation
deleted file mode 100644
index dd310001..00000000
--- a/changes/776.documentation
+++ /dev/null
@@ -1 +0,0 @@
-Updated app config and urls config for providing link to documentation.
\ No newline at end of file
diff --git a/docs/admin/release_notes/version_2.1.md b/docs/admin/release_notes/version_2.1.md
index a2ac2dd4..6861806d 100644
--- a/docs/admin/release_notes/version_2.1.md
+++ b/docs/admin/release_notes/version_2.1.md
@@ -12,3 +12,24 @@
 ### Fixed
 
 - [#723](https://github.com/nautobot/nautobot-app-golden-config/issues/723) - Hide compliance tab in device view if no compliance results exist.
+
+
+## v2.1.1
+
+### Fixed
+
+- [#773](https://github.com/nautobot/nautobot-app-golden-config/issues/773) - Fixed deepdiff dependency range.
+
+### Dependencies
+
+- [#769](https://github.com/nautobot/nautobot-app-golden-config/issues/769) - Updated django-pivot to ~1.9.0.
+
+### Documentation
+
+- [#771](https://github.com/nautobot/nautobot-app-golden-config/issues/771) - Updated navigation tree for documentation updates for 2.1 release notes and XML compliance.
+- [#775](https://github.com/nautobot/nautobot-app-golden-config/issues/775) - Add FAQ for deepdiff and numpy dependency issue.
+- [#776](https://github.com/nautobot/nautobot-app-golden-config/issues/776) - Updated app config and urls config for providing link to documentation.
+
+### Housekeeping
+
+- [#769](https://github.com/nautobot/nautobot-app-golden-config/issues/769) - Added view tests for ConfigComplianceUIViewSet.
diff --git a/pyproject.toml b/pyproject.toml
index c31050d9..52410407 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nautobot-golden-config"
-version = "2.1.0"
+version = "2.1.1"
 description = "An app for configuration on nautobot"
 authors = ["Network to Code, LLC <opensource@networktocode.com>"]
 license = "Apache-2.0"