diff options
| author | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-02 07:40:32 +0300 |
|---|---|---|
| committer | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-02 23:32:48 +0300 |
| commit | 6f41be3b4725f58b79f5bfd09b31c0738fafb159 (patch) | |
| tree | d9c8b447134fb60a01fa98d26edbe332327a6cc2 /pipeline | |
| parent | 45c4f865e8b5c2e79c96628383d8dca4cdc5317d (diff) | |
Use consistent mono image for Docker and Travis tests.
Previously, Travis used the latest mono image. By using the same one as
the Docker image, we would have caught the problem in issue #4403
before the changes were merged into the master branch.
Diffstat (limited to 'pipeline')
| -rw-r--r-- | pipeline/shared/duplicati.sh | 2 | ||||
| -rwxr-xr-x | pipeline/stage_build/trigger.sh | 5 | ||||
| -rwxr-xr-x | pipeline/stage_unittests/trigger.sh | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pipeline/shared/duplicati.sh b/pipeline/shared/duplicati.sh index c58546e3c..720a37af5 100644 --- a/pipeline/shared/duplicati.sh +++ b/pipeline/shared/duplicati.sh @@ -6,4 +6,4 @@ declare -a FORWARD_OPTS export UPDATE_SOURCE="${DUPLICATI_ROOT}/Updates/build/${BUILDTAG}_source" export UPDATE_TARGET="${DUPLICATI_ROOT}/Updates/build/${BUILDTAG}_target" - +export MONO_IMAGE="$(cat "${TRAVIS_BUILD_DIR}/Installer/Docker/mono_image.txt")" diff --git a/pipeline/stage_build/trigger.sh b/pipeline/stage_build/trigger.sh index c583ffc8b..71dc7593d 100755 --- a/pipeline/stage_build/trigger.sh +++ b/pipeline/stage_build/trigger.sh @@ -1,7 +1,8 @@ #!/bin/bash . error_handling.sh +. ./pipeline/shared/duplicati.sh PACKAGES="libgtk2.0-cil rsync" -docker-run --image mono \ +docker-run --image "${MONO_IMAGE}" \ --packages "$PACKAGES" \ ---command "/pipeline/stage_build/job.sh" $@
\ No newline at end of file +--command "/pipeline/stage_build/job.sh" $@ diff --git a/pipeline/stage_unittests/trigger.sh b/pipeline/stage_unittests/trigger.sh index 4d493175a..4d3e41444 100755 --- a/pipeline/stage_unittests/trigger.sh +++ b/pipeline/stage_unittests/trigger.sh @@ -1,7 +1,8 @@ #!/bin/bash . error_handling.sh +. ./pipeline/shared/duplicati.sh PACKAGES="wget unzip rsync" -docker-run --image mono \ +docker-run --image "${MONO_IMAGE}" \ --packages "$PACKAGES" \ ---command "/pipeline/stage_unittests/job.sh" $@
\ No newline at end of file +--command "/pipeline/stage_unittests/job.sh" $@ |