Skip to content

Commit fafe78f

Browse files
author
MarcoFalke
committed
ci: Rename .travis/ to ./ci/
1 parent 8bd5e0a commit fafe78f

File tree

13 files changed

+19
-19
lines changed

13 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ env:
5656
- DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
5757
- 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."
5858
before_install:
59-
- set -o errexit; source .travis/test_03_before_install.sh
59+
- set -o errexit; source ./ci/test/03_before_install.sh
6060
install:
61-
- set -o errexit; source .travis/test_04_install.sh
61+
- set -o errexit; source ./ci/test/04_install.sh
6262
before_script:
63-
- set -o errexit; source .travis/test_05_before_script.sh
63+
- set -o errexit; source ./ci/test/05_before_script.sh
6464
script:
6565
- export CONTINUE=1
6666
- if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long
6767
- if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time)
68-
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
68+
- if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
6969
- 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
7070
- if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time)
71-
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
71+
- if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
7272
after_script:
7373
- echo $TRAVIS_COMMIT_RANGE
7474
- echo $TRAVIS_COMMIT_LOG
@@ -82,11 +82,11 @@ jobs:
8282
language: python
8383
python: '3.5' # Oldest supported version according to doc/dependencies.md
8484
install:
85-
- set -o errexit; source .travis/lint_04_install.sh
85+
- set -o errexit; source ./ci/lint/04_install.sh
8686
before_script:
87-
- set -o errexit; source .travis/lint_05_before_script.sh
87+
- set -o errexit; source ./ci/lint/05_before_script.sh
8888
script:
89-
- set -o errexit; source .travis/lint_06_script.sh
89+
- set -o errexit; source ./ci/lint/06_script.sh
9090

9191
- stage: extended-lint
9292
name: 'extended lint [runtime >= 60 seconds]'
@@ -95,11 +95,11 @@ jobs:
9595
language: python
9696
python: '3.5'
9797
install:
98-
- set -o errexit; source .travis/extended_lint_04_install.sh
98+
- set -o errexit; source ./ci/extended_lint/04_install.sh
9999
before_script:
100-
- set -o errexit; source .travis/lint_05_before_script.sh
100+
- set -o errexit; source ./ci/lint/05_before_script.sh
101101
script:
102-
- set -o errexit; source .travis/extended_lint_06_script.sh
102+
- set -o errexit; source ./ci/extended_lint/06_script.sh
103103

104104
- stage: test
105105
name: 'ARM [GOAL: install] [no unit or functional tests]'

.travis/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

ci/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## ci scripts
2+
3+
This directory contains scripts for each build step in each build stage.
4+
5+
Currently three stages `lint`, `extended_lint` and `test` are defined. Each stage has its own lifecycle, similar to the
6+
[Travis CI lifecycle](https://docs.travis-ci.com/user/job-lifecycle#the-job-lifecycle). Every script in here is named
7+
and numbered according to which stage and lifecycle step it belongs to.
8+
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)