Skip to content

Commit fcf51c1

Browse files
authored
Merge pull request #580 from puppetlabs/3.1.0-release-prep
3.1.0 release prep
2 parents dc68a88 + e7e5269 commit fcf51c1

4 files changed

Lines changed: 40 additions & 21 deletions

File tree

.github/workflows/release.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@ jobs:
2929
echo "version=$version" >> $GITHUB_OUTPUT
3030
echo "Found version $version from lib/vmpooler/version.rb"
3131
32-
- name: Generate Changelog
33-
uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
34-
with:
35-
args: >-
36-
--future-release ${{ steps.nv.outputs.version }}
37-
env:
38-
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
# - name: Generate Changelog
33+
# uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
34+
# with:
35+
# args: >-
36+
# --future-release ${{ steps.nv.outputs.version }}
37+
# env:
38+
# CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939

40-
- name: Validate Changelog
41-
run : |
42-
set -e
43-
if [[ -n $(git status --porcelain) ]]; then
44-
echo "Here is the current git status:"
45-
git status
46-
echo
47-
echo "The following changes were detected:"
48-
git --no-pager diff
49-
echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`"
50-
exit 1
51-
fi
40+
# - name: Validate Changelog
41+
# run : |
42+
# set -e
43+
# if [[ -n $(git status --porcelain) ]]; then
44+
# echo "Here is the current git status:"
45+
# git status
46+
# echo
47+
# echo "The following changes were detected:"
48+
# git --no-pager diff
49+
# echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`"
50+
# exit 1
51+
# fi
5252

5353
- name: Generate Release Notes
5454
uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## [3.1.0](https://github.com/puppetlabs/vmpooler/tree/3.1.0) (2023-04-28)
4+
5+
[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.0.0...3.1.0)
6+
7+
**Merged pull requests:**
8+
9+
- Bump rubocop from 1.50.1 to 1.50.2 [\#578](https://github.com/puppetlabs/vmpooler/pull/578) ([dependabot[bot]](https://github.com/apps/dependabot))
10+
- Update puma requirement from ~\> 5.0, \>= 5.0.4 to \>= 5.0.4, \< 7 [\#577](https://github.com/puppetlabs/vmpooler/pull/577) ([dependabot[bot]](https://github.com/apps/dependabot))
11+
- Update opentelemetry-resource\_detectors requirement from = 0.19.1 to = 0.23.0 [\#576](https://github.com/puppetlabs/vmpooler/pull/576) ([dependabot[bot]](https://github.com/apps/dependabot))
12+
- Migrate issue management to Jira [\#575](https://github.com/puppetlabs/vmpooler/pull/575) ([yachub](https://github.com/yachub))
13+
- Bump jruby to 9.4.2.0 [\#574](https://github.com/puppetlabs/vmpooler/pull/574) ([yachub](https://github.com/yachub))
14+
- Update rubocop requirement from ~\> 1.28.2 to ~\> 1.50.1 [\#573](https://github.com/puppetlabs/vmpooler/pull/573) ([dependabot[bot]](https://github.com/apps/dependabot))
15+
- Update sinatra requirement from ~\> 2.0 to \>= 2, \< 4 [\#572](https://github.com/puppetlabs/vmpooler/pull/572) ([dependabot[bot]](https://github.com/apps/dependabot))
16+
- Bump net-ldap from 0.17.1 to 0.18.0 [\#571](https://github.com/puppetlabs/vmpooler/pull/571) ([dependabot[bot]](https://github.com/apps/dependabot))
17+
- Update prometheus-client requirement from ~\> 2.0 to \>= 2, \< 5 [\#566](https://github.com/puppetlabs/vmpooler/pull/566) ([dependabot[bot]](https://github.com/apps/dependabot))
18+
- Bump rack-test from 2.0.2 to 2.1.0 [\#564](https://github.com/puppetlabs/vmpooler/pull/564) ([dependabot[bot]](https://github.com/apps/dependabot))
19+
- Update rack requirement from ~\> 2.2 to \>= 2.2, \< 4.0 [\#562](https://github.com/puppetlabs/vmpooler/pull/562) ([dependabot[bot]](https://github.com/apps/dependabot))
20+
- Update opentelemetry-exporter-jaeger requirement from = 0.20.1 to = 0.22.0 [\#524](https://github.com/puppetlabs/vmpooler/pull/524) ([dependabot[bot]](https://github.com/apps/dependabot))
21+
322
## [3.0.0](https://github.com/puppetlabs/vmpooler/tree/3.0.0) (2023-03-28)
423

524
[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/2.5.0...3.0.0)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
vmpooler (3.0.0)
4+
vmpooler (3.1.0)
55
concurrent-ruby (~> 1.1)
66
connection_pool (~> 2.2)
77
deep_merge (~> 1.2)

lib/vmpooler/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Vmpooler
4-
VERSION = '3.0.0'
4+
VERSION = '3.1.0'
55
end

0 commit comments

Comments
 (0)