From 8889816a51df17e2e78cdcaa17bda0780393bd0d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 13 Jun 2024 09:23:32 -0400
Subject: [PATCH] Use stock ruby environment on CI lint tasks (#30657)

---
 .github/workflows/bundler-audit.yml |  9 +++++++--
 .github/workflows/lint-haml.yml     | 10 ++++++++--
 .github/workflows/lint-ruby.yml     |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index 48f9d82933c..e3e2da0c787 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -21,12 +21,17 @@ jobs:
   security:
     runs-on: ubuntu-latest
 
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Run bundler-audit
         run: bundle exec bundler-audit check --update
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index 25615b720d4..ca4b0c80bfd 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -26,12 +26,18 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Run haml-lint
         run: |
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index 411b323486a..2e4de55725b 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -27,12 +27,17 @@ jobs:
   lint:
     runs-on: ubuntu-latest
 
+    env:
+      BUNDLE_ONLY: development
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Set-up RuboCop Problem Matcher
         uses: r7kamura/rubocop-problem-matchers-action@v1