Skip to content

Commit 3b64418

Browse files
authored
ci: simplify screenshot dependency install privilege handling
1 parent 373e71c commit 3b64418

1 file changed

Lines changed: 12 additions & 19 deletions

File tree

.github/workflows/main.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,30 +148,23 @@ jobs:
148148
- name: Install ANGLE Vulkan software-rendering dependencies
149149
run: |
150150
set -eux
151-
if [ "$(id -u)" -ne 0 ]; then
152-
if ! command -v sudo >/dev/null 2>&1; then
153-
echo "apt-get requires root privileges or sudo" >&2
154-
exit 1
155-
fi
156-
if ! sudo -n true >/dev/null 2>&1; then
157-
echo "sudo requires password authentication, which is unavailable in non-interactive mode" >&2
158-
exit 1
159-
fi
160-
fi
161-
run_apt() {
162-
if [ "$(id -u)" -eq 0 ]; then
163-
apt-get "$@"
164-
else
165-
sudo apt-get "$@"
166-
fi
167-
}
168-
run_apt update
169-
run_apt install -y --no-install-recommends \
151+
if command -v sudo >/dev/null 2>&1; then
152+
sudo apt-get update
153+
sudo apt-get install -y --no-install-recommends \
154+
libegl1-mesa \
155+
libgles2-mesa \
156+
libvulkan1 \
157+
mesa-vulkan-drivers \
158+
vulkan-tools
159+
else
160+
apt-get update
161+
apt-get install -y --no-install-recommends \
170162
libegl1-mesa \
171163
libgles2-mesa \
172164
libvulkan1 \
173165
mesa-vulkan-drivers \
174166
vulkan-tools
167+
fi
175168
- name: Setup the java environment
176169
uses: actions/setup-java@v5
177170
with:

0 commit comments

Comments
 (0)