Merge pull request #44 from opus-codium/modulesync

opus-codium · May 13, 2021 · 8c6848c · 8c6848c
2 parents 06de116 + 85a3371
commit 8c6848c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,15 @@
 
 name: CI
 
-on: pull_request
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
 
 jobs:
   setup_matrix:

diff --git a/Gemfile b/Gemfile
@@ -14,10 +14,10 @@ group :system_tests do
   gem 'voxpupuli-acceptance',         :require => false
 end
 group :release do
-  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
-  gem 'puppet-blacksmith',           :require => false
-  gem 'voxpupuli-release',           :require => false
-  gem 'puppet-strings', '>= 2.2',    :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
+  gem 'puppet-blacksmith',                        :require => false
+  gem 'voxpupuli-release',                        :require => false
+  gem 'puppet-strings', '>= 2.2',                 :require => false
 end
 gem 'puppetlabs_spec_helper', '~> 2.0', :require => false
 gem 'rake', :require => false