sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: relocate dash-specific CI scripts to its own directory

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-12-13 12:31:14 +05:30
parent 607707f9f9
commit 06b595b6ee
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -80,7 +80,7 @@ builder-image:
before_script: before_script:
- export CACHE_DIR=$CI_PROJECT_DIR/cache - export CACHE_DIR=$CI_PROJECT_DIR/cache
- echo BUILD_TARGET=$BUILD_TARGET - echo BUILD_TARGET=$BUILD_TARGET
- source ./ci/matrix.sh - source ./ci/dash/matrix.sh
# Setup some environment variables # Setup some environment variables
- | - |
@ -109,8 +109,8 @@ builder-image:
stage: build stage: build
extends: .base-template extends: .base-template
script: script:
- ./ci/build_src.sh - ./ci/dash/build_src.sh
- ./ci/test_unittests.sh # Run unit tests in build stage to avoid creating too many parallel jobs - ./ci/dash/test_unittests.sh # Run unit tests in build stage to avoid creating too many parallel jobs
cache: cache:
# Let all branches share the same cache, which is ok because ccache is able to handle it # Let all branches share the same cache, which is ok because ccache is able to handle it
key: key:
@ -141,7 +141,7 @@ builder-image:
INTEGRATION_TESTS_ARGS: "--extended --exclude feature_pruning,feature_dbcrash" INTEGRATION_TESTS_ARGS: "--extended --exclude feature_pruning,feature_dbcrash"
script: script:
- echo "INTEGRATION_TESTS_ARGS=${INTEGRATION_TESTS_ARGS}" - echo "INTEGRATION_TESTS_ARGS=${INTEGRATION_TESTS_ARGS}"
- ./ci/test_integrationtests.sh $INTEGRATION_TESTS_ARGS - ./ci/dash/test_integrationtests.sh $INTEGRATION_TESTS_ARGS
after_script: after_script:
- mkdir -p $CI_PROJECT_DIR/testlogs - mkdir -p $CI_PROJECT_DIR/testlogs
artifacts: artifacts:

14
.travis.yml
View File

@ -31,20 +31,20 @@ stages:
builddepends: &builddepends builddepends: &builddepends
stage: build depends stage: build depends
script: script:
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
buildsrc: &buildsrc buildsrc: &buildsrc
stage: build src stage: build src
script: script:
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
- $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh
runtests: &runtests runtests: &runtests
stage: run tests stage: run tests
script: script:
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh
- $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh
- $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh - $DOCKER_RUN_IN_BUILDER ./ci/dash/test_unittests.sh
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi
- $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --quiet --jobs=3 ${extended} - $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --quiet --jobs=3 ${extended}
@ -52,7 +52,7 @@ builddocker: &builddocker
stage: build docker stage: build docker
script: script:
# no need to run tests again here # no need to run tests again here
- if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi - if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/dash/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/dash/build_src.sh && BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
- MAKEJOBS=-j3 - MAKEJOBS=-j3
- RUN_UNIT_TESTS=true - RUN_UNIT_TESTS=true

2
ci/build_depends.sh → ci/dash/build_depends.sh
View File

@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
set -e set -e
source ./ci/matrix.sh source ./ci/dash/matrix.sh
unset CC; unset CXX unset CC; unset CXX
unset DISPLAY unset DISPLAY

2
ci/build_src.sh → ci/dash/build_src.sh
View File

@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
set -e set -e
source ./ci/matrix.sh source ./ci/dash/matrix.sh
unset CC; unset CXX unset CC; unset CXX
unset DISPLAY unset DISPLAY

0
ci/matrix.sh → ci/dash/matrix.sh
View File

2
ci/test_integrationtests.sh → ci/dash/test_integrationtests.sh
View File

@ -8,7 +8,7 @@ set -e
PASS_ARGS="$*" PASS_ARGS="$*"
source ./ci/matrix.sh source ./ci/dash/matrix.sh
if [ "$RUN_INTEGRATIONTESTS" != "true" ]; then if [ "$RUN_INTEGRATIONTESTS" != "true" ]; then
echo "Skipping integration tests" echo "Skipping integration tests"

2
ci/test_unittests.sh → ci/dash/test_unittests.sh
View File

@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8
set -e set -e
source ./ci/matrix.sh source ./ci/dash/matrix.sh
if [ "$RUN_UNITTESTS" != "true" ]; then if [ "$RUN_UNITTESTS" != "true" ]; then
echo "Skipping unit tests" echo "Skipping unit tests"