From 75169a17828a01b8773e5755fa36588298a67b54 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 16 Apr 2025 18:55:36 +0100 Subject: [PATCH] workflows/vendor-version: fix handling of Ruby upgrades --- .github/workflows/vendor-version.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/vendor-version.yml b/.github/workflows/vendor-version.yml index 6ec0a95d7a..fe317b3119 100644 --- a/.github/workflows/vendor-version.yml +++ b/.github/workflows/vendor-version.yml @@ -46,13 +46,16 @@ jobs: - name: Compare to base ref working-directory: ${{ steps.set-up-homebrew.outputs.gems-path }}/${{ steps.ruby-abi.outputs.version }} env: + ABI_VERSION: ${{ steps.ruby-abi.outputs.version }} VENDOR_VERSION: ${{ steps.gem-info.outputs.vendor-version }} IGNORED_GEMS: ${{ steps.gem-info.outputs.ignored }} run: | git checkout "origin/${GITHUB_BASE_REF}" rm .homebrew_vendor_version brew install-bundler-gems --groups=all - if [[ "$(<.homebrew_vendor_version)" == "${VENDOR_VERSION}" ]]; then + if [[ "$(brew ruby -e "puts Gem.ruby_api_version")" == "${ABI_VERSION}" && \ + "$(<.homebrew_vendor_version)" == "${VENDOR_VERSION}" ]] + then while IFS= read -r gem; do gem_dir="./gems/${gem}" [[ -d "${gem_dir}" ]] || continue