From 3ad8171f9c50c718e29ae161030d95d7b43f0d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20C=C3=A1mara?= Date: Thu, 14 May 2026 17:45:33 +0200 Subject: [PATCH 1/3] Automate AWS and sequel minor bump on lock file patch bumps and add config parameter to improve flexibility --- .github/workflows/version_bumps.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/version_bumps.yml b/.github/workflows/version_bumps.yml index cdff37755c..9a4d202daa 100644 --- a/.github/workflows/version_bumps.yml +++ b/.github/workflows/version_bumps.yml @@ -16,6 +16,11 @@ on: - "patch" - "minor" - "major" + extra_gems_minor: + description: 'Additional gems to bump at minor level (space-separated).' + required: false + default: '' + type: string permissions: pull-requests: write @@ -45,6 +50,16 @@ jobs: - run: git config --global user.name "logstashmachine" - run: ./gradlew clean installDefaultGems - run: ./vendor/jruby/bin/jruby -S bundle update --all --${{ github.event.inputs.bump }} --strict + - name: Bump selected deps at minor level + if: ${{ inputs.bump == 'patch' }} + run: | + AWS_GEMS=$(./vendor/jruby/bin/jruby -S bundle list --name-only | grep '^aws-') + EXTRA="${{ inputs.extra_gems_minor }}" + GEMS=$(echo "${AWS_GEMS} sequel ${EXTRA}" | xargs) + if [ -n "$GEMS" ]; then + echo "Bumping at --minor: ${GEMS}" + ./vendor/jruby/bin/jruby -S bundle update $GEMS --minor --strict --conservative + fi - run: mv Gemfile.lock Gemfile.jruby-*.lock.release - run: echo "T=$(date +%s)" >> $GITHUB_ENV - run: echo "BRANCH=update_lock_${{ env.INPUTS_BRANCH }}_${T}" >> $GITHUB_ENV From 86b47ffa6da4a00822fb62206efef506b1bff022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20C=C3=A1mara?= Date: Thu, 14 May 2026 17:56:11 +0200 Subject: [PATCH 2/3] Add step to bump selected gems to major releases --- .github/workflows/version_bumps.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version_bumps.yml b/.github/workflows/version_bumps.yml index 9a4d202daa..c0a5b72df4 100644 --- a/.github/workflows/version_bumps.yml +++ b/.github/workflows/version_bumps.yml @@ -17,7 +17,12 @@ on: - "minor" - "major" extra_gems_minor: - description: 'Additional gems to bump at minor level (space-separated).' + description: 'Additional gems to bump at minor level (space-separated)' + required: false + default: '' + type: string + extra_gems_major: + description: 'Additional gems to bump at major level (space-separated)' required: false default: '' type: string @@ -60,6 +65,14 @@ jobs: echo "Bumping at --minor: ${GEMS}" ./vendor/jruby/bin/jruby -S bundle update $GEMS --minor --strict --conservative fi + - name: Bump selected deps at major level + if: ${{ inputs.bump != 'major' && inputs.extra_gems_major != '' }} + run: | + GEMS=$(echo "${{ inputs.extra_gems_major }}" | xargs) + if [ -n "$GEMS" ]; then + echo "Bumping at --major: ${GEMS}" + ./vendor/jruby/bin/jruby -S bundle update $GEMS --major --strict --conservative + fi - run: mv Gemfile.lock Gemfile.jruby-*.lock.release - run: echo "T=$(date +%s)" >> $GITHUB_ENV - run: echo "BRANCH=update_lock_${{ env.INPUTS_BRANCH }}_${T}" >> $GITHUB_ENV From 02fde752690edb405e427b31d895b795d6bf8e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20C=C3=A1mara?= Date: Fri, 15 May 2026 09:52:38 +0200 Subject: [PATCH 3/3] Update default Release Branch --- .github/workflows/version_bumps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version_bumps.yml b/.github/workflows/version_bumps.yml index c0a5b72df4..3f61300474 100644 --- a/.github/workflows/version_bumps.yml +++ b/.github/workflows/version_bumps.yml @@ -5,7 +5,7 @@ on: branch: description: 'Release Branch' required: true - default: '8.4' + default: '8.19' type: string bump: description: 'Bump type'