summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-29 14:56:51 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2017-08-29 14:56:51 (GMT)
commitda48508a880dca2faed2b2c1a23f2de3535b3223 (patch)
tree863d76a9a9cf932dced000157db252c555eb48ab
parent3458d7369246f83f26f802bf9d9827c67cf40f69 (diff)
downloaddefinitions-da48508a880dca2faed2b2c1a23f2de3535b3223.tar.gz
.gitlab-ci.yml: Fix up previous commit
The "downloadable" state is the one we need to special-case. The "cached" state means that the artifact is cached *locally*, and BuildStream will already avoid rebuilding it in this case.
-rwxr-xr-xscripts/bst-build-or-show2
-rwxr-xr-xscripts/bst-cross-build-or-show2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/bst-build-or-show b/scripts/bst-build-or-show
index 7a8a8ec..eac56a9 100755
--- a/scripts/bst-build-or-show
+++ b/scripts/bst-build-or-show
@@ -9,7 +9,7 @@
set -eu
bst_target="$1"
-if [ "$(bst show $bst_target --deps none --format '%{state}')" == 'cached' ]; then
+if [ "$(bst show $bst_target --deps none --format '%{state}')" == 'downloadable' ]; then
bst --colors show $bst_target
else
bst --colors build $bst_target
diff --git a/scripts/bst-cross-build-or-show b/scripts/bst-cross-build-or-show
index 3be2b48..3dfed9e 100755
--- a/scripts/bst-cross-build-or-show
+++ b/scripts/bst-cross-build-or-show
@@ -10,7 +10,7 @@
set -eu
bst_target_arch="$1"
bst_target="$2"
-if [ "$(bst --target-arch=$bst_target_arch show $bst_target --deps none --format '%{state}')" == 'cached' ]; then
+if [ "$(bst --target-arch=$bst_target_arch show $bst_target --deps none --format '%{state}')" == 'downloadable' ]; then
bst --colors --target-arch="$bst_target_arch" show $bst_target
else
bst --colors --target-arch="$bst_target_arch" build $bst_target