From 7b234006af7636bb8d3ef0e3d33ceb0cb16e2de5 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 1 May 2023 08:26:50 -0400 Subject: [PATCH 1/2] 1.1.0 release prep --- CHANGELOG.md | 9 +++++++++ Gemfile.lock | 2 +- lib/vmpooler-dns-gcp/version.rb | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69c291..f951323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.1.0](https://github.com/puppetlabs/vmpooler-dns-gcp/tree/1.1.0) (2023-05-01) + +[Full Changelog](https://github.com/puppetlabs/vmpooler-dns-gcp/compare/1.0.0...1.1.0) + +**Merged pull requests:** + +- Migrate issue management to Jira [\#4](https://github.com/puppetlabs/vmpooler-dns-gcp/pull/4) ([yachub](https://github.com/yachub)) +- Bump jruby to 9.4.2.0 [\#3](https://github.com/puppetlabs/vmpooler-dns-gcp/pull/3) ([yachub](https://github.com/yachub)) + ## [1.0.0](https://github.com/puppetlabs/vmpooler-dns-gcp/tree/1.0.0) (2023-04-19) [Full Changelog](https://github.com/puppetlabs/vmpooler-dns-gcp/compare/0.0.1...1.0.0) diff --git a/Gemfile.lock b/Gemfile.lock index bdeed66..7a6198f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - vmpooler-dns-gcp (1.0.0) + vmpooler-dns-gcp (1.1.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) vmpooler (~> 3.0) diff --git a/lib/vmpooler-dns-gcp/version.rb b/lib/vmpooler-dns-gcp/version.rb index c93ff3f..8ded2a1 100644 --- a/lib/vmpooler-dns-gcp/version.rb +++ b/lib/vmpooler-dns-gcp/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module VmpoolerDnsGcp - VERSION = '1.0.0' + VERSION = '1.1.0' end From 50241297167926a4785724f740a3e73d919b3fe1 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 1 May 2023 08:27:22 -0400 Subject: [PATCH 2/2] Comment changelog validation until jira support is added --- .github/workflows/release.yml | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f3c38d..c92ed8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,26 +29,26 @@ jobs: echo "version=$version" >> $GITHUB_OUTPUT echo "Found version $version from lib/vmpooler-dns-gcp/version.rb" - - name: Generate Changelog - uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 - with: - args: >- - --future-release ${{ steps.nv.outputs.version }} - env: - CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Generate Changelog + # uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 + # with: + # args: >- + # --future-release ${{ steps.nv.outputs.version }} + # env: + # CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Validate Changelog - run : | - set -e - if [[ -n $(git status --porcelain) ]]; then - echo "Here is the current git status:" - git status - echo - echo "The following changes were detected:" - git --no-pager diff - echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`" - exit 1 - fi + # - name: Validate Changelog + # run : | + # set -e + # if [[ -n $(git status --porcelain) ]]; then + # echo "Here is the current git status:" + # git status + # echo + # echo "The following changes were detected:" + # git --no-pager diff + # echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`" + # exit 1 + # fi - name: Generate Release Notes uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2