From 19d1d309468613f3d25596883e646c207953f88c Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:22:20 +1000 Subject: [PATCH] Change cross compiler to fixed version (#794) * Change cross compiler to fixed version * Update compiler version in travis --- .travis.yml | 2 +- scripts/cross-compile.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c94da2c44..02505c726 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: #- make lint - make fmt-check vet it after_success: -- docker pull stashapp/compiler:develop +- docker pull stashapp/compiler:3 - sh ./scripts/cross-compile.sh - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi' before_deploy: diff --git a/scripts/cross-compile.sh b/scripts/cross-compile.sh index 5b9066ecb..4521e0814 100755 --- a/scripts/cross-compile.sh +++ b/scripts/cross-compile.sh @@ -14,4 +14,4 @@ LINUX_ARM32v6="echo '=== Building Linux (armv6 | Raspberry Pi 1) binary ==='; $S COMMAND="$SETUP $WINDOWS $DARWIN $LINUX_AMD64 $LINUX_ARM64v8 $LINUX_ARM32v7 $LINUX_ARM32v6 echo '=== Build complete ==='" -docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:develop /bin/bash -c "$COMMAND" +docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:3 /bin/bash -c "$COMMAND"