From fafe78f6aedfc0ac865379c412a87670b6211021 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 10 Aug 2019 11:32:55 -0400 Subject: [PATCH] ci: Rename .travis/ to ./ci/ --- .travis.yml | 22 +++++++++---------- .travis/README.md | 8 ------- ci/README.md | 8 +++++++ .../extended_lint/04_install.sh | 0 .../extended_lint/06_script.sh | 0 .../lint/04_install.sh | 0 .../lint/05_before_script.sh | 0 .../lint_06_script.sh => ci/lint/06_script.sh | 0 .../test/03_before_install.sh | 0 .../test/04_install.sh | 0 .../test/05_before_script.sh | 0 .../test/06_script_a.sh | 0 .../test/06_script_b.sh | 0 13 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 .travis/README.md create mode 100644 ci/README.md rename .travis/extended_lint_04_install.sh => ci/extended_lint/04_install.sh (100%) rename .travis/extended_lint_06_script.sh => ci/extended_lint/06_script.sh (100%) rename .travis/lint_04_install.sh => ci/lint/04_install.sh (100%) rename .travis/lint_05_before_script.sh => ci/lint/05_before_script.sh (100%) rename .travis/lint_06_script.sh => ci/lint/06_script.sh (100%) rename .travis/test_03_before_install.sh => ci/test/03_before_install.sh (100%) rename .travis/test_04_install.sh => ci/test/04_install.sh (100%) rename .travis/test_05_before_script.sh => ci/test/05_before_script.sh (100%) rename .travis/test_06_script_a.sh => ci/test/06_script_a.sh (100%) rename .travis/test_06_script_b.sh => ci/test/06_script_b.sh (100%) diff --git a/.travis.yml b/.travis.yml index d49c116a5..b54ed67b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,19 +56,19 @@ env: - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache" - CACHE_ERR_MSG="Error! Initial build successful, but not enough time remains to run later build stages and tests. Please manually re-run this job by using the travis restart button or asking a bitcoin maintainer to restart. The next run should not time out because the build cache has been saved." before_install: - - set -o errexit; source .travis/test_03_before_install.sh + - set -o errexit; source ./ci/test/03_before_install.sh install: - - set -o errexit; source .travis/test_04_install.sh + - set -o errexit; source ./ci/test/04_install.sh before_script: - - set -o errexit; source .travis/test_05_before_script.sh + - set -o errexit; source ./ci/test/05_before_script.sh script: - export CONTINUE=1 - if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time) - - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi + - if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi - if [ $SECONDS -gt 2000 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time) - - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi + - if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi after_script: - echo $TRAVIS_COMMIT_RANGE - echo $TRAVIS_COMMIT_LOG @@ -82,11 +82,11 @@ jobs: language: python python: '3.5' # Oldest supported version according to doc/dependencies.md install: - - set -o errexit; source .travis/lint_04_install.sh + - set -o errexit; source ./ci/lint/04_install.sh before_script: - - set -o errexit; source .travis/lint_05_before_script.sh + - set -o errexit; source ./ci/lint/05_before_script.sh script: - - set -o errexit; source .travis/lint_06_script.sh + - set -o errexit; source ./ci/lint/06_script.sh - stage: extended-lint name: 'extended lint [runtime >= 60 seconds]' @@ -95,11 +95,11 @@ jobs: language: python python: '3.5' install: - - set -o errexit; source .travis/extended_lint_04_install.sh + - set -o errexit; source ./ci/extended_lint/04_install.sh before_script: - - set -o errexit; source .travis/lint_05_before_script.sh + - set -o errexit; source ./ci/lint/05_before_script.sh script: - - set -o errexit; source .travis/extended_lint_06_script.sh + - set -o errexit; source ./ci/extended_lint/06_script.sh - stage: test name: 'ARM [GOAL: install] [no unit or functional tests]' diff --git a/.travis/README.md b/.travis/README.md deleted file mode 100644 index 21d1b9cc0..000000000 --- a/.travis/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## travis build scripts - -The `.travis` directory contains scripts for each build step in each build stage. -Currently the travis build defines two stages `lint` and `test`. Each stage has -it's own [lifecycle](https://docs.travis-ci.com/user/customizing-the-build/#the-build-lifecycle). -Every script in here is named and numbered according to which stage and lifecycle -step it belongs to. - diff --git a/ci/README.md b/ci/README.md new file mode 100644 index 000000000..0aed238c7 --- /dev/null +++ b/ci/README.md @@ -0,0 +1,8 @@ +## ci scripts + +This directory contains scripts for each build step in each build stage. + +Currently three stages `lint`, `extended_lint` and `test` are defined. Each stage has its own lifecycle, similar to the +[Travis CI lifecycle](https://docs.travis-ci.com/user/job-lifecycle#the-job-lifecycle). Every script in here is named +and numbered according to which stage and lifecycle step it belongs to. + diff --git a/.travis/extended_lint_04_install.sh b/ci/extended_lint/04_install.sh similarity index 100% rename from .travis/extended_lint_04_install.sh rename to ci/extended_lint/04_install.sh diff --git a/.travis/extended_lint_06_script.sh b/ci/extended_lint/06_script.sh similarity index 100% rename from .travis/extended_lint_06_script.sh rename to ci/extended_lint/06_script.sh diff --git a/.travis/lint_04_install.sh b/ci/lint/04_install.sh similarity index 100% rename from .travis/lint_04_install.sh rename to ci/lint/04_install.sh diff --git a/.travis/lint_05_before_script.sh b/ci/lint/05_before_script.sh similarity index 100% rename from .travis/lint_05_before_script.sh rename to ci/lint/05_before_script.sh diff --git a/.travis/lint_06_script.sh b/ci/lint/06_script.sh similarity index 100% rename from .travis/lint_06_script.sh rename to ci/lint/06_script.sh diff --git a/.travis/test_03_before_install.sh b/ci/test/03_before_install.sh similarity index 100% rename from .travis/test_03_before_install.sh rename to ci/test/03_before_install.sh diff --git a/.travis/test_04_install.sh b/ci/test/04_install.sh similarity index 100% rename from .travis/test_04_install.sh rename to ci/test/04_install.sh diff --git a/.travis/test_05_before_script.sh b/ci/test/05_before_script.sh similarity index 100% rename from .travis/test_05_before_script.sh rename to ci/test/05_before_script.sh diff --git a/.travis/test_06_script_a.sh b/ci/test/06_script_a.sh similarity index 100% rename from .travis/test_06_script_a.sh rename to ci/test/06_script_a.sh diff --git a/.travis/test_06_script_b.sh b/ci/test/06_script_b.sh similarity index 100% rename from .travis/test_06_script_b.sh rename to ci/test/06_script_b.sh