diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2021-03-06 16:59:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-06 16:59:56 +0300 |
| commit | 2ec08314474c5e7fc6fb17324f98735b34dea052 (patch) | |
| tree | ef1ea5b10bdc522c8fe6c0bea861cbf78e6154a8 /pipeline | |
| parent | 0c37b4fc3c2ede023911bb94375f1e4de23dadd2 (diff) | |
| parent | 529e4c7ce516635a0150e9fca3ef24c862d174b7 (diff) | |
Merge pull request #4410 from warwickmm/use_consistent_mono_images
Use consistent (and updated) mono versions for Docker and Travis
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" $@ |