From aaf21121667ee142a88898a0fce90408c6bcae2e Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 6 Mar 2023 14:45:41 -0500 Subject: [PATCH 1/2] Update and consolidate release prep step --- README.md | 9 ++++----- release-prep | 15 +++++++++++++++ update-changelog | 5 ----- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100755 release-prep delete mode 100755 update-changelog diff --git a/README.md b/README.md index f65a5ba..29cb7a6 100644 --- a/README.md +++ b/README.md @@ -57,11 +57,10 @@ Verify, and update if needed, that the docker tag in the script and GitHub actio Follow these steps to publish a new GitHub release, and build and push the gem to . 1. Bump the "VERSION" in `lib/vmpooler-provider-gce/version.rb` appropriately based on changes in `CHANGELOG.md` since the last release. -2. Run `./update-gemfile-lock` to update `Gemfile.lock`. -3. Run `./update-changelog` to update `CHANGELOG.md`. -4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label. -5. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow. +2. Run `./release-prep` to update `Gemfile.lock` and `CHANGELOG.md`. +3. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label. +4. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow. ## License -vmpooler-provider-gce is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details. \ No newline at end of file +vmpooler-provider-gce is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). See the [LICENSE](LICENSE) file for more details. diff --git a/release-prep b/release-prep new file mode 100755 index 0000000..59c10f7 --- /dev/null +++ b/release-prep @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment +# +# Update Gemfile.lock +docker run -it --rm \ + -v $(pwd):/app \ + jruby:9.4.1.0-jdk11 \ + /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' + +# Update Changelog +docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ + githubchangeloggenerator/github-changelog-generator:1.16.2 \ + github_changelog_generator --future-release $(grep VERSION lib/vmpooler-provider-gce/version.rb |rev |cut -d "'" -f2 |rev) + diff --git a/update-changelog b/update-changelog deleted file mode 100755 index 46b5874..0000000 --- a/update-changelog +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \ - githubchangeloggenerator/github-changelog-generator:1.16.2 \ - github_changelog_generator --future-release $(grep VERSION lib/vmpooler-provider-gce/version.rb |rev |cut -d "'" -f2 |rev) From 407b3f09ddeafa4adc07f6505dba42bbd9b5a391 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 6 Mar 2023 14:49:19 -0500 Subject: [PATCH 2/2] 0.5.0 release prep --- CHANGELOG.md | 9 +++++++-- Gemfile.lock | 2 +- lib/vmpooler-provider-gce/version.rb | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7290f2a..3bc3ea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,16 @@ # Changelog -## [Unreleased](https://github.com/puppetlabs/vmpooler-provider-gce/tree/HEAD) +## [0.5.0](https://github.com/puppetlabs/vmpooler-provider-gce/tree/0.5.0) (2023-03-06) -[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-gce/compare/0.4.0...HEAD) +[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-gce/compare/0.4.0...0.5.0) + +**Implemented enhancements:** + +- \(RE-15161\) Update to jruby-9.4.1.0 and move socket timeout to new method. [\#22](https://github.com/puppetlabs/vmpooler-provider-gce/pull/22) ([isaac-hammes](https://github.com/isaac-hammes)) **Merged pull requests:** +- Add docs and update actions [\#20](https://github.com/puppetlabs/vmpooler-provider-gce/pull/20) ([yachub](https://github.com/yachub)) - \(RE-15111\) Migrate Snyk to Mend Scanning [\#19](https://github.com/puppetlabs/vmpooler-provider-gce/pull/19) ([yachub](https://github.com/yachub)) - \(RE-14811\) Remove DIO as codeowners [\#17](https://github.com/puppetlabs/vmpooler-provider-gce/pull/17) ([yachub](https://github.com/yachub)) - Add Snyk action [\#16](https://github.com/puppetlabs/vmpooler-provider-gce/pull/16) ([yachub](https://github.com/yachub)) diff --git a/Gemfile.lock b/Gemfile.lock index 25eb646..2258b05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - vmpooler-provider-gce (0.4.0) + vmpooler-provider-gce (0.5.0) google-apis-compute_v1 (~> 0.14) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) diff --git a/lib/vmpooler-provider-gce/version.rb b/lib/vmpooler-provider-gce/version.rb index a332a30..effca7b 100644 --- a/lib/vmpooler-provider-gce/version.rb +++ b/lib/vmpooler-provider-gce/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module VmpoolerProviderGce - VERSION = '0.4.0' + VERSION = '0.5.0' end