sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: harmonize parent images, use focal consistently

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2023-05-10 09:52:49 +00:00 committed by PastaPastaPasta
parent 49e01820bb
commit 8b054d49c7
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.fuzzbuzz.yml
View File

@ -1,4 +1,4 @@
base: ubuntu:16.04 base: ubuntu:focal
language: c++ language: c++
engine: libFuzzer engine: libFuzzer
environment: environment:

2
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: "ubuntu:bionic" image: "ubuntu:focal"
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2

14
.travis.yml
View File

@ -183,7 +183,7 @@ install:
- ls -lah $HOST_CACHE_DIR && ls -lah $HOST_CACHE_DIR/depends && ls -lah $HOST_CACHE_DIR/ccache && ls -lah $HOST_CACHE_DIR/docker - ls -lah $HOST_CACHE_DIR && ls -lah $HOST_CACHE_DIR/depends && ls -lah $HOST_CACHE_DIR/ccache && ls -lah $HOST_CACHE_DIR/docker
# Load cached builder image # Load cached builder image
- 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 - 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
- travis_retry docker pull ubuntu:bionic - travis_retry docker pull ubuntu:focal
- 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 - 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
before_script: before_script:
# Make sure stdout is in blocking mode. Otherwise builds will fail due to large writes to stdout # Make sure stdout is in blocking mode. Otherwise builds will fail due to large writes to stdout
@ -213,14 +213,14 @@ after_success:
- set -o errexit; source ./ci/lint/06_script.sh - set -o errexit; source ./ci/lint/06_script.sh
- stage: test - stage: test
name: 'ARM [GOAL: install] [bionic] [unit tests, functional tests]' name: 'ARM [GOAL: install] [focal] [unit tests, functional tests]'
arch: arm64 arch: arm64
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_arm.sh" FILE_ENV="./ci/test/00_setup_env_arm.sh"
QEMU_USER_CMD="" # Can run the tests natively without qemu QEMU_USER_CMD="" # Can run the tests natively without qemu
- stage: test - stage: test
name: 'S390x [GOAL: install] [bionic] [unit tests, functional tests]' name: 'S390x [GOAL: install] [focal] [unit tests, functional tests]'
arch: s390x arch: s390x
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_s390x.sh" FILE_ENV="./ci/test/00_setup_env_s390x.sh"
@ -242,7 +242,7 @@ after_success:
FILE_ENV="./ci/test/00_setup_env_native_centos.sh" FILE_ENV="./ci/test/00_setup_env_native_centos.sh"
- stage: test - stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]' name: 'x86_64 Linux [GOAL: install] [focal] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]'
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
# x86_64 Linux (xenial, no depends, only system libs, sanitizers: thread (TSan)) # x86_64 Linux (xenial, no depends, only system libs, sanitizers: thread (TSan))
@ -253,17 +253,17 @@ after_success:
TEST_RUNNER_EXTRA="--exclude feature_block" # Not enough memory on travis machines TEST_RUNNER_EXTRA="--exclude feature_block" # Not enough memory on travis machines
# x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer) # x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer)
- stage: test - stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]' name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_native_asan.sh" FILE_ENV="./ci/test/00_setup_env_native_asan.sh"
- stage: test - stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]' name: 'x86_64 Linux [GOAL: install] [focal] [no wallet]'
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh" FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
- stage: test - stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, fuzzers under valgrind]' name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, fuzzers under valgrind]'
env: >- env: >-
FILE_ENV="./ci/test/00_setup_env_native_fuzz_with_valgrind.sh" FILE_ENV="./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"

2
ci/test/00_setup_env.sh
View File

@ -39,7 +39,7 @@ export USE_BUSY_BOX=${USE_BUSY_BOX:-false}
export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true} export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true}
export RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:-true} export RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:-true}
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false} export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04} export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:focal}
# Randomize test order. # Randomize test order.
# See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html # See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1} export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}

2
contrib/containers/deploy/Dockerfile
View File

@ -1,4 +1,4 @@
FROM phusion/baseimage:bionic-1.0.0 FROM phusion/baseimage:focal-1.0.0
LABEL maintainer="Dash Developers <dev@dash.org>" LABEL maintainer="Dash Developers <dev@dash.org>"
LABEL description="Dockerised DashCore, built from Travis" LABEL description="Dockerised DashCore, built from Travis"

2
contrib/containers/deploy/Dockerfile.GitHubActions.Release
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic FROM ubuntu:focal
LABEL maintainer="Dash Developers <dev@dash.org>" LABEL maintainer="Dash Developers <dev@dash.org>"
LABEL description="Dockerised DashCore" LABEL description="Dockerised DashCore"