Skip to content

Commit 9fd8721

Browse files
authored
Update github-runner logging.
1 parent 7c81507 commit 9fd8721

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

github-runner

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ start() {
99

1010

1111
if [[ -n $RUNNER_CONFIG ]]; then
12-
say Launching runner with run.sh ...
12+
say Configuring runner with config.sh ...
1313
line
1414
configure
1515
else
@@ -30,8 +30,8 @@ start() {
3030
wait $RUNNER_PID
3131

3232
else
33-
say Launching runner with run.sh ... SKIPPED.
34-
say Exiting github-runner.
33+
say Skipped running due to --no-run option.
34+
say Exiting github-runner-installer.
3535
fi
3636

3737
}
@@ -52,6 +52,9 @@ info() {
5252
say "Repo: ${RUNNER_URL_REPO}"
5353
say "Labels: ${RUNNER_CONFIG_LABELS}"
5454
say "Status: ${RUNNER_URL_RUNNERS}"
55+
line
56+
say "Run: ${RUNNER_RUN:-no}"
57+
5558
}
5659
usage() {
5760
say GitHub Runner Script
@@ -76,9 +79,9 @@ verify() {
7679
# Detect path to this script.
7780
# @TODO: Rename RUNNER_SCRIPT_ to reduce confusion with github runner CLI
7881
if [[ -z "$COMPOSER_RUNTIME_BIN_DIR" ]]; then
79-
RUNNER_SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/github-runner"
82+
RUNNER_SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/github-runner-installer"
8083
else
81-
RUNNER_SCRIPT_PATH="$COMPOSER_RUNTIME_BIN_DIR/github-runner"
84+
RUNNER_SCRIPT_PATH="$COMPOSER_RUNTIME_BIN_DIR/github-runner-installer"
8285
fi
8386
if [[ ! -f "${RUNNER_SCRIPT_PATH}" ]]; then
8487
say "Path detection failed."
@@ -280,8 +283,10 @@ configure() {
280283
# Remove
281284
# @TODO: If runner has a job, wait for it to complete.
282285
cd $RUNNER_FOLDER
286+
echo ./config.sh remove --token ${RUNNER_CONFIG_TOKEN}
283287
./config.sh remove --token ${RUNNER_CONFIG_TOKEN} || say "config remove didn't work."
284288

289+
rm -rf .credentials .runner
285290
line
286291
say Configuring new runner...
287292

@@ -329,7 +334,7 @@ cancel() {
329334
exit 1
330335
}
331336
say() {
332-
echo " github-runner | ${*}"
337+
echo " github-runner-installer | ${*}"
333338
}
334339
line() {
335340
CHARACTER="${CHARACTER:--}"

0 commit comments

Comments
 (0)