Skip to content

Commit 9b28bd7

Browse files
author
MarcoFalke
committed
Merge #20691: ci, doc: Travis CI features and mentions cleanup
95487b0 doc: Drop mentions of Travis CI as it is no longer used (Hennadii Stepanov) 09d105e ci: Drop travis_fold feature as Travis CI is no longer used (Hennadii Stepanov) Pull request description: As Travis CI is no longer used, this PR: - drops `travis_fold` feature - drops mentions of Travis CI in docs ACKs for top commit: MarcoFalke: ACK 95487b0 Tree-SHA512: 2e259bb8b1e37bcefc1251737bb2716f06ddb57c490010b373825c4e70f42ca38efae69a2f63f21f577d7cee3725b94097bdddbd313f8ebf499281cf97c53cef
2 parents 816314e + 95487b0 commit 9b28bd7

File tree

10 files changed

+7
-61
lines changed

10 files changed

+7
-61
lines changed

.cirrus.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ task:
7272
<< : *CREDITS_TEMPLATE
7373
setup_script:
7474
- set -o errexit; source ./ci/test/00_setup_env.sh
75-
before_install_script:
76-
- set -o errexit; source ./ci/test/03_before_install.sh
7775
install_script:
7876
- set -o errexit; source ./ci/lint/04_install.sh
7977
before_script:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ There are also [regression and integration tests](/test), written
5656
in Python, that are run automatically on the build server.
5757
These tests can be run (if the [test dependencies](/test) are installed) with: `test/functional/test_runner.py`
5858

59-
The Travis CI system makes sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically.
59+
The CI (Continuous Integration) systems make sure that every pull request is built for Windows, Linux, and macOS,
60+
and that unit/sanity tests are run automatically.
6061

6162
### Manual Quality Assurance (QA) Testing
6263

ci/test/03_before_install.sh

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

ci/test/05_before_script.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ if [ -z "$NO_DEPENDS" ]; then
4747
DOCKER_EXEC $SHELL_OPTS make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
4848
fi
4949
if [ -n "$PREVIOUS_RELEASES_TO_DOWNLOAD" ]; then
50-
BEGIN_FOLD previous-versions
5150
DOCKER_EXEC test/get_previous_releases.py -b -t "$PREVIOUS_RELEASES_DIR" "${PREVIOUS_RELEASES_TO_DOWNLOAD}"
52-
END_FOLD
5351
fi

ci/test/06_script_a.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,22 @@ if [ -z "$NO_WERROR" ]; then
1212
fi
1313
DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
1414

15-
BEGIN_FOLD autogen
1615
if [ -n "$CONFIG_SHELL" ]; then
1716
DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
1817
else
1918
DOCKER_EXEC ./autogen.sh
2019
fi
21-
END_FOLD
2220

2321
DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}"
2422
export P_CI_DIR="${BASE_BUILD_DIR}"
2523

26-
BEGIN_FOLD configure
2724
DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
28-
END_FOLD
2925

30-
BEGIN_FOLD distdir
3126
DOCKER_EXEC make distdir VERSION=$HOST
32-
END_FOLD
3327

3428
export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST"
3529

36-
BEGIN_FOLD configure
3730
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
38-
END_FOLD
3931

4032
set -o errtrace
4133
trap 'DOCKER_EXEC "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
@@ -48,12 +40,8 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
4840
DOCKER_EXEC 'grep -v HAVE_SYS_GETRANDOM src/config/bitcoin-config.h > src/config/bitcoin-config.h.tmp && mv src/config/bitcoin-config.h.tmp src/config/bitcoin-config.h'
4941
fi
5042

51-
BEGIN_FOLD build
5243
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
53-
END_FOLD
5444

55-
BEGIN_FOLD cache_stats
5645
DOCKER_EXEC "ccache --version | head -n 1 && ccache --show-stats"
5746
DOCKER_EXEC du -sh "${DEPENDS_DIR}"/*/
5847
DOCKER_EXEC du -sh "${PREVIOUS_RELEASES_DIR}"
59-
END_FOLD

ci/test/06_script_b.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,39 @@
77
export LC_ALL=C.UTF-8
88

99
if [[ $HOST = *-mingw32 ]]; then
10-
BEGIN_FOLD wrap-wine
1110
# Generate all binaries, so that they can be wrapped
1211
DOCKER_EXEC make $MAKEJOBS -C src/secp256k1 VERBOSE=1
1312
DOCKER_EXEC make $MAKEJOBS -C src/univalue VERBOSE=1
1413
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
15-
END_FOLD
1614
fi
1715

1816
if [ -n "$QEMU_USER_CMD" ]; then
19-
BEGIN_FOLD wrap-qemu
2017
# Generate all binaries, so that they can be wrapped
2118
DOCKER_EXEC make $MAKEJOBS -C src/secp256k1 VERBOSE=1
2219
DOCKER_EXEC make $MAKEJOBS -C src/univalue VERBOSE=1
2320
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh"
24-
END_FOLD
2521
fi
2622

2723
if [ -n "$USE_VALGRIND" ]; then
28-
BEGIN_FOLD wrap-valgrind
2924
DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-valgrind.sh"
30-
END_FOLD
3125
fi
3226

3327
if [ "$RUN_UNIT_TESTS" = "true" ]; then
34-
BEGIN_FOLD unit-tests
3528
DOCKER_EXEC ${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib make $MAKEJOBS check VERBOSE=1
36-
END_FOLD
3729
fi
3830

3931
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
40-
BEGIN_FOLD unit-tests-seq
4132
DOCKER_EXEC ${TEST_RUNNER_ENV} DIR_UNIT_TEST_DATA=${DIR_UNIT_TEST_DATA} LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib "${BASE_BUILD_DIR}/bitcoin-*/src/test/test_bitcoin*" --catch_system_errors=no -l test_suite
42-
END_FOLD
4333
fi
4434

4535
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
46-
BEGIN_FOLD functional-tests
4736
DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib ${TEST_RUNNER_ENV} test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 --timeout-factor=${TEST_RUNNER_TIMEOUT_FACTOR} ${TEST_RUNNER_EXTRA} --quiet --failfast
48-
END_FOLD
4937
fi
5038

5139
if [ "$RUN_SECURITY_TESTS" = "true" ]; then
52-
BEGIN_FOLD security-tests
5340
DOCKER_EXEC make test-security-check
54-
END_FOLD
5541
fi
5642

5743
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
58-
BEGIN_FOLD fuzz-tests
5944
DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib test/fuzz/test_runner.py ${FUZZ_TESTS_CONFIG} $MAKEJOBS -l DEBUG ${DIR_FUZZ_IN}
60-
END_FOLD
6145
fi

ci/test_run_all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
export LC_ALL=C.UTF-8
88

99
set -o errexit; source ./ci/test/00_setup_env.sh
10-
set -o errexit; source ./ci/test/03_before_install.sh
1110
set -o errexit; source ./ci/test/04_install.sh
1211
set -o errexit; source ./ci/test/05_before_script.sh
1312
set -o errexit; source ./ci/test/06_script_a.sh

doc/developer-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ General Bitcoin Core
543543
- *Rationale*: RPC allows for better automatic testing. The test suite for
544544
the GUI is very limited.
545545

546-
- Make sure pull requests pass Travis CI before merging.
546+
- Make sure pull requests pass CI before merging.
547547

548548
- *Rationale*: Makes sure that they pass thorough testing, and that the tester will keep passing
549549
on the master branch. Otherwise, all new pull requests will start failing the tests, resulting in
@@ -1036,7 +1036,7 @@ Scripted diffs
10361036
--------------
10371037

10381038
For reformatting and refactoring commits where the changes can be easily automated using a bash script, we use
1039-
scripted-diff commits. The bash script is included in the commit message and our Travis CI job checks that
1039+
scripted-diff commits. The bash script is included in the commit message and our CI job checks that
10401040
the result of the script is identical to the commit. This aids reviewers since they can verify that the script
10411041
does exactly what it is supposed to do. It is also helpful for rebasing (since the same script can just be re-run
10421042
on the new master commit).

doc/release-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ bitcoin.org (see below for bitcoin.org update instructions).
307307
- First, check to see if the Bitcoin.org maintainers have prepared a
308308
release: https://github.com/bitcoin-dot-org/bitcoin.org/labels/Core
309309

310-
- If they have, it will have previously failed their Travis CI
310+
- If they have, it will have previously failed their CI
311311
checks because the final release files weren't uploaded.
312-
Trigger a Travis CI rebuild---if it passes, merge.
312+
Trigger a CI rebuild---if it passes, merge.
313313

314314
- If they have not prepared a release, follow the Bitcoin.org release
315315
instructions: https://github.com/bitcoin-dot-org/bitcoin.org/blob/master/docs/adding-events-release-notes-and-alerts.md#release-notes

test/functional/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ don't have test cases for.
2323
- The oldest supported Python version is specified in [doc/dependencies.md](/doc/dependencies.md).
2424
Consider using [pyenv](https://github.com/pyenv/pyenv), which checks [.python-version](/.python-version),
2525
to prevent accidentally introducing modern syntax from an unsupported Python version.
26-
The Travis linter also checks this, but [possibly not in all cases](https://github.com/bitcoin/bitcoin/pull/14884#discussion_r239585126).
26+
The CI linter job also checks this, but [possibly not in all cases](https://github.com/bitcoin/bitcoin/pull/14884#discussion_r239585126).
2727
- See [the python lint script](/test/lint/lint-python.sh) that checks for violations that
2828
could lead to bugs and issues in the test code.
2929
- Use [type hints](https://docs.python.org/3/library/typing.html) in your code to improve code readability

0 commit comments

Comments
 (0)