Skip to content

Commit 325fe76

Browse files
committed
Add chown optimization, set up shellcheck
1 parent a6a57d3 commit 325fe76

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.github/workflows/test.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
on:
2+
push:
3+
4+
name: "Trigger: Push action"
5+
6+
jobs:
7+
shellcheck:
8+
name: Shellcheck
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Run ShellCheck
13+
uses: ludeeus/action-shellcheck@master

entrypoint.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/dumb-init /bin/bash
2+
# shellcheck shell=bash
23

34
export RUNNER_ALLOW_RUNASROOT=1
45
export PATH=$PATH:/actions-runner
@@ -26,6 +27,7 @@ _LABELS=${LABELS:-default}
2627
_RUNNER_GROUP=${RUNNER_GROUP:-Default}
2728
_GITHUB_HOST=${GITHUB_HOST:="github.com"}
2829
_RUN_AS_ROOT=${RUN_AS_ROOT:="true"}
30+
_EPHEMERAL=""
2931

3032
# ensure backwards compatibility
3133
if [[ -z $RUNNER_SCOPE ]]; then
@@ -66,11 +68,10 @@ configure_runner() {
6668
RUNNER_TOKEN=$(echo "${_TOKEN}" | jq -r .token)
6769
fi
6870

71+
# shellcheck disable=SC2153
6972
if [ -n "${EPHEMERAL}" ]; then
7073
echo "Ephemeral option is enabled"
7174
_EPHEMERAL="--ephemeral"
72-
else
73-
_EPHEMERAL=""
7475
fi
7576

7677
if [ -n "${DISABLE_AUTO_UPDATE}" ]; then
@@ -95,7 +96,6 @@ configure_runner() {
9596

9697
[[ ! -d "${_RUNNER_WORKDIR}" ]] && mkdir "${_RUNNER_WORKDIR}"
9798

98-
[[ $(id -u) -eq 0 ]] && /usr/bin/chown -R runner ${_RUNNER_WORKDIR} /opt/hostedtoolcache/ /actions-runner || :
9999
}
100100

101101

@@ -141,6 +141,8 @@ if [[ ${_RUN_AS_ROOT} == "true" ]]; then
141141
fi
142142
else
143143
if [[ $(id -u) -eq 0 ]]; then
144+
[[ -n "${CONFIGURED_ACTIONS_RUNNER_FILES_DIR}" ]] && /usr/bin/chown -R runner "${CONFIGURED_ACTIONS_RUNNER_FILES_DIR}"
145+
/usr/bin/chown -R runner "${_RUNNER_WORKDIR}" /opt/hostedtoolcache/ /actions-runner
144146
/usr/sbin/gosu runner "$@"
145147
else
146148
"$@"

0 commit comments

Comments
 (0)