Skip to content

Commit 4e6dc7a

Browse files
author
MarcoFalke
committed
Merge #14665: appveyor: Script improvement part II
99d33a6 appveyor: Script improvement part II (Chun Kuan Lee) Pull request description: - decrease clone depth to 5 - Upgrade to python 3.7 that we can use `PYTHONUTF8` from PEP540. - Set clcache version to `v4.2.0` - Do not fetch the latest vcpkg package (The issue does not exist anymore) - Set test_bitcoin report sink and log sink to stdout and redirect stderr to NUL to drop confusing error messages that introduced by #14146 - discard vcpkg, bench_bitcoin output - Set functional test `--failfast` flag - Make the log be as clear as possible. (Only ~100 lines) Tree-SHA512: e7e1f5c2698e8a5d15394edfb4b574508081e99ef4a353995f55657cb51e642567a128d6432a899ecae6f742494c143ac16e2e64df6c26e1e575421ee4a1df50
2 parents d864e45 + 99d33a6 commit 4e6dc7a

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

.appveyor.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,21 @@ skip_tags: true
33
image: Visual Studio 2017
44
configuration: Release
55
platform: x64
6+
clone_depth: 5
67
environment:
78
APPVEYOR_SAVE_CACHE_ON_ERROR: true
89
CLCACHE_SERVER: 1
910
PACKAGES: boost-filesystem boost-signals2 boost-test libevent openssl zeromq berkeleydb secp256k1 leveldb
10-
PYTHONIOENCODING: utf-8
11+
PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
12+
PYTHONUTF8: 1
1113
cache:
1214
- C:\tools\vcpkg\installed
1315
- C:\Users\appveyor\clcache
14-
init:
15-
- cmd: set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH%
1616
install:
17-
- cmd: pip install git+https://github.com/frerich/clcache.git
17+
- cmd: pip install --quiet git+https://github.com/frerich/clcache.git@v4.2.0
1818
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
1919
# - cmd: pip install zmq
20-
- ps: $packages = $env:PACKAGES -Split ' '
21-
- ps: for ($i=0; $i -lt $packages.length; $i++) {
22-
$env:ALL_PACKAGES += $packages[$i] + ":" + $env:PLATFORM + "-windows-static "
23-
}
24-
- cmd: git -C C:\Tools\vcpkg pull # This is a temporary fix, can be removed after appveyor update its image to include Microsoft/vcpkg#4046
25-
- cmd: C:\Tools\vcpkg\bootstrap-vcpkg.bat
26-
- cmd: vcpkg remove --recurse --outdated
27-
- cmd: vcpkg install %ALL_PACKAGES%
20+
- cmd: vcpkg install --triplet %PLATFORM%-windows-static %PACKAGES% > NUL
2821
- cmd: del /s /q C:\Tools\vcpkg\installed\%PLATFORM%-windows-static\debug # Remove unused debug library
2922
before_build:
3023
- ps: clcache -M 536870912
@@ -42,7 +35,7 @@ before_build:
4235
build_script:
4336
- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:q /nowarn:C4244;C4267;C4715 /nologo
4437
after_build:
45-
- ps: fsutil behavior set disablelastaccess 0 # Disable Access time feature on Windows (better performance)
38+
- ps: fsutil behavior set disablelastaccess 1 # Disable Access time feature on Windows (better performance)
4639
- ps: clcache -z
4740
before_test:
4841
- ps: ${conf_ini} = (Get-Content([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini.in")))
@@ -57,9 +50,9 @@ before_test:
5750
- ps: '[IO.File]::WriteAllLines([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini"), ${conf_ini}, ${utf8})'
5851
- ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src
5952
test_script:
60-
- cmd: src\test_bitcoin.exe
61-
- ps: src\bench_bitcoin.exe -evals=1 -scaling=0
53+
- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
54+
- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
6255
- ps: python test\util\bitcoin-util-test.py
6356
- cmd: python test\util\rpcauth-test.py
64-
- cmd: python test\functional\test_runner.py --ci --force --quiet --combinedlogslen=4000
57+
- cmd: python test\functional\test_runner.py --ci --force --quiet --combinedlogslen=4000 --failfast
6558
deploy: off

0 commit comments

Comments
 (0)