From 15077755d8e6d5694b9b4238cee1151aff7e2e38 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Tue, 7 Mar 2023 12:38:32 -0500 Subject: [PATCH] Use jruby 9.4.1 --- .github/workflows/release.yml | 4 ++-- .github/workflows/testing.yml | 2 -- Gemfile.lock | 4 ++-- README.md | 7 +++---- release-prep | 15 +++++++++++++++ update-changelog | 5 ----- update-gemfile-lock | 4 ++-- 7 files changed, 24 insertions(+), 17 deletions(-) create mode 100755 release-prep delete mode 100755 update-changelog diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1a9dc7..428c102 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,10 +70,10 @@ jobs: prerelease: false # This step should closely match what is used in `docker/Dockerfile` in vmpooler-deployment - - name: Install Ruby jruby-9.3.6.0 + - name: Install Ruby jruby-9.4.1.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 'jruby-9.3.6.0' + ruby-version: 'jruby-9.4.1.0' - name: Build gem run: gem build *.gemspec diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 784c332..eac55b3 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,7 +18,6 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.3.6.0' - 'jruby-9.4.1.0' steps: - uses: actions/checkout@v3 @@ -35,7 +34,6 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.3.6.0' - 'jruby-9.4.1.0' steps: - uses: actions/checkout@v3 diff --git a/Gemfile.lock b/Gemfile.lock index ccb908a..e97ba76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,7 +44,7 @@ GEM zonefile (~> 1.04) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) + google-cloud-errors (1.3.1) googleauth (1.2.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) @@ -109,7 +109,7 @@ GEM public_suffix (5.0.1) puma (5.6.5-java) nio4r (~> 2.0) - rack (2.2.6.2) + rack (2.2.6.3) rack-protection (2.2.4) rack rainbow (3.1.1) diff --git a/README.md b/README.md index 8afa87f..0f25d9e 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,9 @@ 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-dns-gcp/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 diff --git a/release-prep b/release-prep new file mode 100755 index 0000000..31d7f07 --- /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-dns-gcp/version.rb |rev |cut -d "'" -f2 |rev) + diff --git a/update-changelog b/update-changelog deleted file mode 100755 index 9f3ec69..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-dns-gcp/version.rb |rev |cut -d "'" -f2 |rev) diff --git a/update-gemfile-lock b/update-gemfile-lock index 74e9c78..778bde9 100755 --- a/update-gemfile-lock +++ b/update-gemfile-lock @@ -3,5 +3,5 @@ # The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment docker run -it --rm \ -v $(pwd):/app \ - jruby:9.3.6-jdk \ - /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' + jruby:9.4.1.0-jdk11 \ + /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git netbase && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'