Skip to content

Commit 738b0e6

Browse files
authored
Merge pull request #1236 from voxpupuli/modulesync
modulesync 9.2.0
2 parents 543c582 + d1ca3da commit 738b0e6

File tree

7 files changed

+33
-13
lines changed

7 files changed

+33
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
name: CI
66

7+
# yamllint disable-line rule:truthy
78
on:
89
pull_request: {}
910
push:
@@ -18,4 +19,4 @@ concurrency:
1819
jobs:
1920
puppet:
2021
name: Puppet
21-
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
22+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3

.github/workflows/labeler.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
name: "Pull Request Labeler"
66

7+
# yamllint disable-line rule:truthy
78
on:
89
pull_request_target: {}
910

.github/workflows/prepare_release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: 'Prepare Release'
6+
7+
on:
8+
workflow_dispatch:
9+
inputs:
10+
version:
11+
description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
12+
required: false
13+
14+
jobs:
15+
release_prep:
16+
uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
17+
with:
18+
version: ${{ github.event.inputs.version }}
19+
allowed_owner: 'voxpupuli'
20+
secrets:
21+
# Configure secrets here:
22+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
23+
github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'

.github/workflows/release.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
name: Release
66

7+
# yamllint disable-line rule:truthy
78
on:
89
push:
910
tags:
@@ -12,18 +13,11 @@ on:
1213
jobs:
1314
release:
1415
name: Release
15-
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
16+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
1617
with:
1718
allowed_owner: 'voxpupuli'
1819
secrets:
1920
# Configure secrets here:
2021
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
2122
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
2223
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}
23-
24-
create-github-release:
25-
name: Create GitHub Release
26-
runs-on: ubuntu-latest
27-
steps:
28-
- name: Create GitHub release
29-
uses: voxpupuli/gha-create-a-github-release@v1

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '9.1.0'
5+
modulesync_config_version: '9.5.0'

.pmtignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/.github/
2121
/.librarian/
2222
/Puppetfile.lock
23+
/Puppetfile
2324
*.iml
2425
/.editorconfig
2526
/.fixtures.yml

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group :test do
77
gem 'voxpupuli-test', '~> 9.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
10-
gem 'puppet_metadata', '~> 4.0', :require => false
10+
gem 'puppet_metadata', '~> 5.0', :require => false
1111
gem 'bcrypt', :require => false
1212
gem 'webmock', :require => false
1313
end
@@ -18,7 +18,7 @@ group :development do
1818
end
1919

2020
group :system_tests do
21-
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
21+
gem 'voxpupuli-acceptance', '~> 3.5', :require => false
2222
gem 'bcrypt', :require => false
2323
gem 'rspec-retry', :require => false
2424
gem 'simp-beaker-helpers', :require => false
@@ -31,7 +31,7 @@ end
3131
gem 'rake', :require => false
3232
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3333

34-
puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
34+
puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
3535
gem 'puppet', puppetversion, :require => false, :groups => [:test]
3636

3737
# vim: syntax=ruby

0 commit comments

Comments
 (0)