From 681dafd02838ddd50b7fe8dde02b040aeee3afcc Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Wed, 15 Jul 2020 18:59:43 +0100
Subject: [PATCH] Adjust container checks for GitHub Actions changes
---
Library/Homebrew/brew.rb | 2 +-
Library/Homebrew/brew.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index 1fe2a8c576..08e0055cce 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -127,7 +127,7 @@ begin
ENV.delete("HOMEBREW_HELP") if help_flag
tap_commands = []
cgroup = Utils.popen_read("cat", "/proc/1/cgroup")
- if !cgroup.include?("azpl_job") && !cgroup.include?("docker")
+ if %w[azpl_job actions_job docker garden kubepods].none? { |container| cgroup.include?(container) }
brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
end
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 96331447b3..f53ee7ddb2 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -433,8 +433,8 @@ fi
check-run-command-as-root() {
[[ "$(id -u)" = 0 ]] || return
- # Allow Azure Pipelines/Docker/Concourse/Kubernetes to do everything as root (as it's normal there)
- [[ -f /proc/1/cgroup ]] && grep -E "azpl_job|docker|garden|kubepods" -q /proc/1/cgroup && return
+ # Allow Azure Pipelines/GitHub Actions/Docker/Concourse/Kubernetes to do everything as root (as it's normal there)
+ [[ -f /proc/1/cgroup ]] && grep -E "azpl_job|actions_job|docker|garden|kubepods" -q /proc/1/cgroup && return
# Homebrew Services may need `sudo` for system-wide daemons.
[[ "$HOMEBREW_COMMAND" = "services" ]] && return
--
GitLab