Merge pull request #16270 from Bo98/vendor-version-check-fix

workflows: move vendor version check to separate workflow
Homebrew · Nov 30, 2023 · 2067314 · 2067314
2 parents 395ea6b + ed6d4f9
commit 2067314
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 54 deletions.
diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml
@@ -22,60 +22,6 @@ permissions:
   pull-requests: read
 
 jobs:
-  check-vendor-version:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Set up Homebrew
-        id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-        with:
-          core: false
-          cask: false
-          test-bot: false
-
-      - name: Install Bundler RubyGems
-        run: brew install-bundler-gems --groups=all
-
-      - name: Get Ruby ABI version
-        id: ruby-abi
-        run: echo "version=$(brew ruby -e "puts Gem.ruby_api_version")" >> "${GITHUB_OUTPUT}"
-
-      - name: Get gem info
-        id: gem-info
-        working-directory: ${{ steps.set-up-homebrew.outputs.gems-path }}/${{ steps.ruby-abi.outputs.version }}/gems
-        run: |
-          {
-            echo "vendor-version=$(cat ../.homebrew_vendor_version)"
-            echo "ignored<<EOS"
-            git check-ignore -- *
-            echo "EOS"
-          } >> "${GITHUB_OUTPUT}"
-
-      - name: Compare to base ref
-        working-directory: ${{ steps.set-up-homebrew.outputs.gems-path }}/${{ steps.ruby-abi.outputs.version }}
-        run: |
-          git checkout "origin/${GITHUB_BASE_REF}"
-          rm .homebrew_vendor_version
-          brew install-bundler-gems --groups=all
-          if [[ "$(cat .homebrew_vendor_version)" == "${{ steps.gem-info.outputs.vendor-version }}" ]]; then
-            ignored_gems="${{ steps.gem-info.outputs.ignored }}"
-            while IFS= read -r gem; do
-              gem_dir="./gems/${gem}"
-              [[ -d "${gem_dir}" ]] || continue
-              exit_code=0
-              git check-ignore --quiet "${gem_dir}" || exit_code=$?
-              if (( exit_code != 0 )); then
-                if (( exit_code == 1 )); then
-                  echo "::error::VENDOR_VERSION needs bumping in utils/gems.rb" >&2
-                else
-                  echo "::error::git check-ignore failed" >&2
-                fi
-                exit "${exit_code}"
-              fi
-            done <<< "${ignored_gems}"
-          fi
-
   vendor-gems:
     if: >
       github.repository_owner == 'Homebrew' && (

diff --git a/.github/workflows/vendor-version.yml b/.github/workflows/vendor-version.yml
@@ -0,0 +1,64 @@
+name: Check Vendor Version
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/vendor-version.yml
+      - Library/Homebrew/vendor/bundle/ruby/**
+
+permissions:
+  contents: read
+
+jobs:
+  check-vendor-version:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+        with:
+          core: false
+          cask: false
+          test-bot: false
+
+      - name: Install Bundler RubyGems
+        run: brew install-bundler-gems --groups=all
+
+      - name: Get Ruby ABI version
+        id: ruby-abi
+        run: echo "version=$(brew ruby -e "puts Gem.ruby_api_version")" >> "${GITHUB_OUTPUT}"
+
+      - name: Get gem info
+        id: gem-info
+        working-directory: ${{ steps.set-up-homebrew.outputs.gems-path }}/${{ steps.ruby-abi.outputs.version }}/gems
+        run: |
+          {
+            echo "vendor-version=$(cat ../.homebrew_vendor_version)"
+            echo "ignored<<EOS"
+            git check-ignore -- *
+            echo "EOS"
+          } >> "${GITHUB_OUTPUT}"
+
+      - name: Compare to base ref
+        working-directory: ${{ steps.set-up-homebrew.outputs.gems-path }}/${{ steps.ruby-abi.outputs.version }}
+        run: |
+          git checkout "origin/${GITHUB_BASE_REF}"
+          rm .homebrew_vendor_version
+          brew install-bundler-gems --groups=all
+          if [[ "$(cat .homebrew_vendor_version)" == "${{ steps.gem-info.outputs.vendor-version }}" ]]; then
+            ignored_gems="${{ steps.gem-info.outputs.ignored }}"
+            while IFS= read -r gem; do
+              gem_dir="./gems/${gem}"
+              [[ -d "${gem_dir}" ]] || continue
+              exit_code=0
+              git check-ignore --quiet "${gem_dir}" || exit_code=$?
+              if (( exit_code != 0 )); then
+                if (( exit_code == 1 )); then
+                  echo "::error::VENDOR_VERSION needs bumping in utils/gems.rb" >&2
+                else
+                  echo "::error::git check-ignore failed" >&2
+                fi
+                exit "${exit_code}"
+              fi
+            done <<< "${ignored_gems}"
+          fi