Use jruby 9.4.1

.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

.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

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)

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 <https://rubygems.org>.
 
 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`.
+2. Run `./release-prep` to update `Gemfile.lock` and `CHANGELOG.md`.
-3. Run `./update-changelog` to update `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. 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.
-5. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow.
 
 ## License
 

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)
+

update-changelog

@@ -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)

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 \
+  jruby:9.4.1.0-jdk11 \
-  /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=$?"'
+  /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=$?"'