Skip to content

Commit 8b054d4

Browse files
kwvgPastaPastaPasta
authored andcommitted
ci: harmonize parent images, use focal consistently
1 parent 49e0182 commit 8b054d4

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.fuzzbuzz.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
base: ubuntu:16.04
1+
base: ubuntu:focal
22
language: c++
33
engine: libFuzzer
44
environment:

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: "ubuntu:bionic"
1+
image: "ubuntu:focal"
22

33
variables:
44
DOCKER_DRIVER: overlay2

.travis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ install:
183183
- ls -lah $HOST_CACHE_DIR && ls -lah $HOST_CACHE_DIR/depends && ls -lah $HOST_CACHE_DIR/ccache && ls -lah $HOST_CACHE_DIR/docker
184184
# Load cached builder image
185185
- if [ -f $HOST_CACHE_DIR/docker/dash-builder-$BUILD_TARGET.tar.gz ]; then zcat $HOST_CACHE_DIR/docker/dash-builder-$BUILD_TARGET.tar.gz | docker load || true; fi
186-
- travis_retry docker pull ubuntu:bionic
186+
- travis_retry docker pull ubuntu:focal
187187
- travis_retry docker build -t $BUILDER_IMAGE_NAME --build-arg=USER_ID=$UID --build-arg=GROUP_ID=$UID --build-arg=BUILD_TARGET=$BUILD_TARGET -f contrib/containers/ci/Dockerfile ci
188188
before_script:
189189
# Make sure stdout is in blocking mode. Otherwise builds will fail due to large writes to stdout
@@ -213,14 +213,14 @@ after_success:
213213
- set -o errexit; source ./ci/lint/06_script.sh
214214

215215
- stage: test
216-
name: 'ARM [GOAL: install] [bionic] [unit tests, functional tests]'
216+
name: 'ARM [GOAL: install] [focal] [unit tests, functional tests]'
217217
arch: arm64
218218
env: >-
219219
FILE_ENV="./ci/test/00_setup_env_arm.sh"
220220
QEMU_USER_CMD="" # Can run the tests natively without qemu
221221
222222
- stage: test
223-
name: 'S390x [GOAL: install] [bionic] [unit tests, functional tests]'
223+
name: 'S390x [GOAL: install] [focal] [unit tests, functional tests]'
224224
arch: s390x
225225
env: >-
226226
FILE_ENV="./ci/test/00_setup_env_s390x.sh"
@@ -242,7 +242,7 @@ after_success:
242242
FILE_ENV="./ci/test/00_setup_env_native_centos.sh"
243243
244244
- stage: test
245-
name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]'
245+
name: 'x86_64 Linux [GOAL: install] [focal] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]'
246246
env: >-
247247
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
248248
# x86_64 Linux (xenial, no depends, only system libs, sanitizers: thread (TSan))
@@ -253,17 +253,17 @@ after_success:
253253
TEST_RUNNER_EXTRA="--exclude feature_block" # Not enough memory on travis machines
254254
# x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer)
255255
- stage: test
256-
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
256+
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
257257
env: >-
258258
FILE_ENV="./ci/test/00_setup_env_native_asan.sh"
259259
260260
- stage: test
261-
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
261+
name: 'x86_64 Linux [GOAL: install] [focal] [no wallet]'
262262
env: >-
263263
FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
264264
265265
- stage: test
266-
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, fuzzers under valgrind]'
266+
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, fuzzers under valgrind]'
267267
env: >-
268268
FILE_ENV="./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
269269

ci/test/00_setup_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export USE_BUSY_BOX=${USE_BUSY_BOX:-false}
3939
export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true}
4040
export RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:-true}
4141
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
42-
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04}
42+
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:focal}
4343
# Randomize test order.
4444
# See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html
4545
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}

contrib/containers/deploy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phusion/baseimage:bionic-1.0.0
1+
FROM phusion/baseimage:focal-1.0.0
22
LABEL maintainer="Dash Developers <[email protected]>"
33
LABEL description="Dockerised DashCore, built from Travis"
44

contrib/containers/deploy/Dockerfile.GitHubActions.Release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic
1+
FROM ubuntu:focal
22
LABEL maintainer="Dash Developers <[email protected]>"
33
LABEL description="Dockerised DashCore"
44

0 commit comments

Comments
 (0)