fix(run): local tasks override non-local tasks

This commit is contained in:
Oliver Davies 2023-10-19 23:07:38 +02:00
parent 08e81c5e16
commit fbfd751621
4 changed files with 12 additions and 12 deletions

View file

@ -8,9 +8,6 @@ set -eu
PATH="$PATH:./node_modules/.bin"
# Include any local tasks.
source run.local || true
{% if not isFlake %}
# If we're running in CI we need to disable TTY allocation for docker compose
# commands that enable it by default, such as exec and run.
@ -106,6 +103,9 @@ function _run {
}
{% endif %}
# Include any local tasks.
source run.local || true
TIMEFORMAT=$'\nTask completed in %3lR'
time "${@:-help}"

View file

@ -4,9 +4,6 @@
set -eu
# Include any local tasks.
source run.local || true
# Run automated tests as part of the Continuous Integration (CI) pipeline.
function ci:test {
lint:dockerfile
@ -133,6 +130,9 @@ function _run {
"${service}" "${@}"
}
# Include any local tasks.
source run.local || true
TIMEFORMAT=$'\nTask completed in %3lR'
time "${@:-help}"

View file

@ -9,9 +9,6 @@ set -eu
PATH="$PATH:./node_modules/.bin"
# Include any local tasks.
source run.local || true
{% if isDocker %}
# If we're running in CI we need to disable TTY allocation for docker compose
# commands that enable it by default, such as exec and run.
@ -123,6 +120,9 @@ function _run {
}
{% endif %}
# Include any local tasks.
source run.local || true
TIMEFORMAT=$'\nTask completed in %3lR'
time "${@:-help}"

View file

@ -4,9 +4,6 @@
set -eu
# Include any local tasks.
source run.local || true
# Disable Git hooks.
function git-hooks:off {
git config --unset core.hooksPath
@ -26,6 +23,9 @@ function help {
printf "\nExtended help:\n Each task has comments for general usage\n"
}
# Include any local tasks.
source run.local || true
TIMEFORMAT=$'\nTask completed in %3lR'
time "${@:-help}"