Merge pull request #23007 from Fryguy/fix_renovate_prs

Fix Renovate PRs
ManageIQ · Apr 26, 2024 · 2d5ecbd · 2d5ecbd
2 parents 0bb2004 + 6b09212
commit 2d5ecbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bin/before_install b/bin/before_install
@@ -38,7 +38,7 @@ if [ -n "$CI" ]; then
   echo
 
   # Gemfile.lock.release only applies to non-master branches and PRs to non-master branches
-  if [[ "$GITHUB_REPOSITORY_OWNER" = "ManageIQ" && "$GITHUB_BASE_REF" != "master" && "$GITHUB_REF_NAME" != "master" && "$GITHUB_REF_NAME" != "dependabot/"* ]]; then
+  if [[ "$GITHUB_REPOSITORY_OWNER" = "ManageIQ" && "$GITHUB_BASE_REF" != "master" && "$GITHUB_REF_NAME" != "master" && "$GITHUB_REF_NAME" != "dependabot/"* && "$GITHUB_REF_NAME" != "renovate/"* ]]; then
     echo "== Setup Gemfile.lock.release =="
     cp -f "$APP_ROOT/Gemfile.lock.release" "$APP_ROOT/Gemfile.lock"
     echo

diff --git a/lib/manageiq/environment.rb b/lib/manageiq/environment.rb
@@ -80,7 +80,8 @@ def self.setup_gemfile_lock
       return unless ENV["GITHUB_REPOSITORY_OWNER"] == "ManageIQ" &&
                     ENV["GITHUB_BASE_REF"] != "master" && # PR to non-master branch
                     ENV["GITHUB_REF_NAME"] != "master" && # A non-master branch
-                    !ENV["GITHUB_REF_NAME"].to_s.start_with?("dependabot/") # Dependabot makes branches in the core repo
+                    !ENV["GITHUB_REF_NAME"].to_s.start_with?("dependabot/") && # Dependabot makes branches in the core repo
+                    !ENV["GITHUB_REF_NAME"].to_s.start_with?("renovate/")      # Renovate makes branches in the core repo
 
       raise "Missing Gemfile.lock.release" unless APP_ROOT.join("Gemfile.lock.release").file?