From 275a6cb998ccbb254dacf18a54ba1081369c2150 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 12 Jan 2024 16:13:42 +0100
Subject: [PATCH] Apply best practices for our changelog generator

---
 .github/workflows/test.yml | 2 --
 Gemfile                    | 6 +++---
 Rakefile                   | 7 ++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ea204e2..2dc2f0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,5 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-        env:
-          BUNDLE_WITHOUT: release
       - name: Run tests
         run: bundle exec rake spec
diff --git a/Gemfile b/Gemfile
index 9a44a82..7bde168 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
 
-group :release do
-  gem 'faraday-retry', require: false
-  gem 'github_changelog_generator', require: false
+group :release, optional: true do
+  gem 'faraday-retry', '~> 2.1', require: false
+  gem 'github_changelog_generator','~> 1.16', '>= 1.16.4', require: false
 end
diff --git a/Rakefile b/Rakefile
index 5047fa4..41cfb81 100644
--- a/Rakefile
+++ b/Rakefile
@@ -169,13 +169,14 @@ end
 begin
   require 'rubygems'
   require 'github_changelog_generator/task'
-
+rescue LoadError
+  # github_changelog_generator is an optional group
+else
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog modulesync}
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog github_actions]
     config.user = 'voxpupuli'
     config.project = 'beaker-openstack'
     config.future_release = Gem::Specification.load("#{config.project}.gemspec").version
   end
-rescue LoadError
 end