diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d72f0565a0..d15d24491c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,4 @@ -### Global defaults - -env: +env: # Global defaults PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y" MAKEJOBS: "-j4" TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache @@ -96,17 +94,14 @@ task: x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"' IgnoreWarnIntDirInTempDetected: 'true' merge_script: - - ps: git config --global user.email "ci@ci.ci" - - ps: git config --global user.name "ci" + - git config --global user.email "ci@ci.ci" + - git config --global user.name "ci" # Windows filesystem loses the executable bit, and all of the executable # files are considered "modified" now. It will break the following `git merge` # command. The next two commands make git ignore this issue. - - ps: git config core.filemode false - - ps: git reset --hard - - ps: if ($env:CIRRUS_PR -eq $null) { exit 0; } - - ps: git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH - # Merge base to detect silent merge conflicts. - - ps: git merge FETCH_HEAD + - git config core.filemode false + - git reset --hard + - PowerShell -NoLogo -Command if ($env:CIRRUS_PR -ne $null) { git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH; git merge FETCH_HEAD; } msvc_qt_built_cache: folder: "%QTBASEDIR%" reupload_on_changes: false @@ -130,6 +125,7 @@ task: folder: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives' install_python_script: - choco install --yes --no-progress python3 --version=3.9.6 + - pip install zmq - python -VV install_vcpkg_script: - cd .. @@ -149,6 +145,8 @@ task: - src\bench_bitcoin.exe > NUL - python test\util\test_runner.py - python test\util\rpcauth-test.py + functional_tests_script: + - python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 rpc_help feature_config_args rpc_signer feature_presegwit_node_upgrade "tool_wallet.py --descriptors" --failfast # TODO enable '--extended' and remove cherry-picked test list task: name: 'ARM [unit tests, no functional tests] [buster]' |