Skip to content

Commit 668d975

Browse files
committed
Move block to more appropriate position
1 parent 964b87a commit 668d975

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

travis/travis-docker.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ docker pull "$IMAGE" || true
4343
IMAGE="$IMAGE":latest
4444
docker build --cache-from "$IMAGE" -t "$IMAGE" -f "$DOCKERFILE" .
4545

46-
if [[ "$BUILD_LITE" == "" ]]; then
47-
build_script=travis-build.sh
48-
else
49-
build_script=build-lite.sh
50-
fi
51-
5246
# push built image as cache for future builds to registry
5347
# we can do that immediately once the image has been built successfully; if its definition ever changes it will be
5448
# rebuilt anyway
@@ -58,6 +52,13 @@ if [[ "$DOCKER_USERNAME" != "" ]]; then
5852
docker push "$IMAGE"
5953
fi
6054

55+
# figure out which build script to use
56+
if [[ "$BUILD_LITE" == "" ]]; then
57+
build_script=travis-build.sh
58+
else
59+
build_script=build-lite.sh
60+
fi
61+
6162
DOCKER_OPTS=()
6263
# fix for https://stackoverflow.com/questions/51195528/rcc-error-in-resource-qrc-cannot-find-file-png
6364
if [ "$TRAVIS" != "" ]; then

0 commit comments

Comments
 (0)