From 2944f239b63ff1347b494ce3eddb9ab43ca756e5 Mon Sep 17 00:00:00 2001 From: Emma Wu Date: Wed, 21 Apr 2021 06:28:14 +0200 Subject: [PATCH 1/6] build: produce Windows GUI build with Cirrus CI --- .cirrus.yml | 46 +++++++++ share/setup-bitcoin-win.nsi | 180 ++++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+) create mode 100644 share/setup-bitcoin-win.nsi diff --git a/.cirrus.yml b/.cirrus.yml index 6dc029ee51e4..123b95ec7cfc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -101,6 +101,52 @@ task: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_win64.sh" +task: + name: 'Win64 [installer]' + timeout_in: 120m + windows_container: + image: cirrusci/windowsservercore:2019 + cpu: 8 + memory: 16G + clone_script: + - choco install -y git + - cd c:\ + - git clone -b %CIRRUS_BRANCH% %CIRRUS_REPO_CLONE_URL% + install_script: + # Install Vistual Studio build tools and other prerequisites + - choco upgrade -y visualstudio2019-workload-vctools + - choco install -y python3 + install_vcpkgs_script: + # Add vcpkg packages + - git clone https://github.com/microsoft/vcpkg + - .\vcpkg\bootstrap-vcpkg.bat + - .\vcpkg\vcpkg integrate install + - .\vcpkg\vcpkg install boost-process:x64-windows-static boost-variant:x64-windows-static boost-signals2:x64-windows-static boost-multi-index:x64-windows-static boost-test:x64-windows-static + - .\vcpkg\vcpkg install libevent:x64-windows-static sqlite3:x64-windows-static + - .\vcpkg\vcpkg install berkeleydb:x64-windows-static curl:x64-windows-static + - .\vcpkg\vcpkg install zeromq:x64-windows-static rapidcheck:x64-windows-static + add_qt_script: + # Add Qt libraries + - choco install -y wget + - wget https://github.com/sipsorcery/qt_win_binary/releases/download/qt598x64_vs2019_v1681/qt598_x64_vs2019_1681.zip + - unzip qt598_x64_vs2019_1681.zip -d c:\Qt5.9.8_x64_static_vs2019 + build_script: + # Build bitcoin + - cd c:\bitcoin\build_msvc + - py msvc-autogen.py + - '"c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild" bitcoin.sln' + prepare_installer_script: + # Install NSIS and prepare msi package + - choco install -y nsis + - mkdir c:\binaries_windows + - cp c:\bitcoin\build_msvc\x64\Debug\bitcoind.exe c:\binaries_windows + - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-tx.exe c:\binaries_windows + - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-qt.exe c:\binaries_windows + - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-cli.exe c:\binaries_windows + - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-wallet.exe c:\binaries_windows + - cd c:\bitcoin\share + - '"c:\Program Files (x86)\NSIS\makensis.exe" setup-bitcoin-win.nsi' + task: name: '32-bit + dash [gui] [CentOS 8]' << : *GLOBAL_TASK_TEMPLATE diff --git a/share/setup-bitcoin-win.nsi b/share/setup-bitcoin-win.nsi new file mode 100644 index 000000000000..39abb51facff --- /dev/null +++ b/share/setup-bitcoin-win.nsi @@ -0,0 +1,180 @@ +!define PACKAGE_NAME "Bitcoin Core" +Name "${PACKAGE_NAME} (64-bit)" + +RequestExecutionLevel highest +SetCompressor /SOLID lzma +SetDateSave off +Unicode true + +# Uncomment these lines when investigating reproducibility errors +#SetCompress off +#SetDatablockOptimize off + +# General Symbol Definitions +!define REGKEY "SOFTWARE\$(^Name)" +!define PACKAGE_TARNAME "bitcoin" +!define PACKAGE_URL "https://bitcoincore.org/" +!define PACKAGE_VERSION "21.99.0" +!define COMPANY "${PACKAGE_NAME} project" +!define URL ${PACKAGE_URL} + +# MUI Symbol Definitions +!define MUI_ICON "..\share\pixmaps\bitcoin.ico" +!define MUI_WELCOMEFINISHPAGE_BITMAP "..\share\pixmaps\nsis-wizard.bmp" +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_RIGHT +!define MUI_HEADERIMAGE_BITMAP "..\share\pixmaps\nsis-header.bmp" +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY} +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${PACKAGE_NAME}" +!define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe" +!define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\bitcoin-qt.exe +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\share\pixmaps\nsis-wizard.bmp" +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +# Included files +!include Sections.nsh +!include MUI2.nsh +!include x64.nsh + +# Variables +Var StartMenuGroup + +# Installer pages +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +# Installer languages +!insertmacro MUI_LANGUAGE English + +# Installer attributes +InstallDir $PROGRAMFILES64\Bitcoin +CRCCheck on +XPStyle on +BrandingText " " +ShowInstDetails show +VIProductVersion "${PACKAGE_VERSION}.0" +VIAddVersionKey ProductName "${PACKAGE_NAME}" +VIAddVersionKey ProductVersion "${PACKAGE_VERSION}" +VIAddVersionKey CompanyName "${COMPANY}" +VIAddVersionKey CompanyWebsite "${URL}" +VIAddVersionKey FileVersion "${PACKAGE_VERSION}" +VIAddVersionKey FileDescription "Installer for ${PACKAGE_NAME}" +VIAddVersionKey LegalCopyright "" +InstallDirRegKey HKCU "${REGKEY}" Path +ShowUninstDetails show + +# Installer sections +Section -Main SEC0000 + SetOutPath $INSTDIR + SetOverwrite on + File ..\..\binaries_windows\bitcoin-qt.exe + File /oname=COPYING.txt ..\COPYING + File /oname=readme.txt ..\doc\README_windows.txt + SetOutPath $INSTDIR\daemon + File ..\..\binaries_windows\bitcoind.exe + File ..\..\binaries_windows\bitcoin-cli.exe + File ..\..\binaries_windows\bitcoin-tx.exe + File ..\..\binaries_windows\bitcoin-wallet.exe + SetOutPath $INSTDIR\doc + File /r /x Makefile* ..\doc\*.* + SetOutPath $INSTDIR + WriteRegStr HKCU "${REGKEY}\Components" Main 1 +SectionEnd + +Section -post SEC0001 + WriteRegStr HKCU "${REGKEY}" Path $INSTDIR + SetOutPath $INSTDIR + WriteUninstaller $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory $SMPROGRAMS\$StartMenuGroup + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\bitcoin-qt.exe + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\${PACKAGE_NAME} (testnet, 64-bit).lnk" "$INSTDIR\bitcoin-qt.exe" "-testnet" "$INSTDIR\bitcoin-qt.exe" 1 + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe + !insertmacro MUI_STARTMENU_WRITE_END + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${PACKAGE_VERSION}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}" + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\bitcoin-qt.exe + WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe + WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 + WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 + WriteRegStr HKCR "${PACKAGE_TARNAME}" "URL Protocol" "" + WriteRegStr HKCR "${PACKAGE_TARNAME}" "" "URL:Bitcoin" + WriteRegStr HKCR "${PACKAGE_TARNAME}\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe + WriteRegStr HKCR "${PACKAGE_TARNAME}\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "%1"' +SectionEnd + +# Macro for selecting uninstaller sections +!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID + Push $R0 + ReadRegStr $R0 HKCU "${REGKEY}\Components" "${SECTION_NAME}" + StrCmp $R0 1 0 next${UNSECTION_ID} + !insertmacro SelectSection "${UNSECTION_ID}" + GoTo done${UNSECTION_ID} +next${UNSECTION_ID}: + !insertmacro UnselectSection "${UNSECTION_ID}" +done${UNSECTION_ID}: + Pop $R0 +!macroend + +# Uninstaller sections +Section /o -un.Main UNSEC0000 + Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe + Delete /REBOOTOK $INSTDIR\COPYING.txt + Delete /REBOOTOK $INSTDIR\readme.txt + RMDir /r /REBOOTOK $INSTDIR\daemon + RMDir /r /REBOOTOK $INSTDIR\doc + DeleteRegValue HKCU "${REGKEY}\Components" Main +SectionEnd + +Section -un.post UNSEC0001 + DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\${PACKAGE_NAME} (testnet, 64-bit).lnk" + Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" + Delete /REBOOTOK $INSTDIR\uninstall.exe + Delete /REBOOTOK $INSTDIR\debug.log + Delete /REBOOTOK $INSTDIR\db.log + DeleteRegValue HKCU "${REGKEY}" StartMenuGroup + DeleteRegValue HKCU "${REGKEY}" Path + DeleteRegKey /IfEmpty HKCU "${REGKEY}\Components" + DeleteRegKey /IfEmpty HKCU "${REGKEY}" + DeleteRegKey HKCR "${PACKAGE_TARNAME}" + RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup + RmDir /REBOOTOK $INSTDIR + Push $R0 + StrCpy $R0 $StartMenuGroup 1 + StrCmp $R0 ">" no_smgroup +no_smgroup: + Pop $R0 +SectionEnd + +# Installer functions +Function .onInit + InitPluginsDir + ${If} ${RunningX64} + ; disable registry redirection (enable access to 64-bit portion of registry) + SetRegView 64 + ${Else} + MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system." + Abort + ${EndIf} +FunctionEnd + +# Uninstaller functions +Function un.onInit + ReadRegStr $INSTDIR HKCU "${REGKEY}" Path + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup + !insertmacro SELECT_UNSECTION Main ${UNSEC0000} +FunctionEnd From 5bd543cf0ed801462b424072ad685ed1dc3e17a8 Mon Sep 17 00:00:00 2001 From: Emma Wu Date: Fri, 23 Apr 2021 09:00:06 +0200 Subject: [PATCH 2/6] Update Qt version for Cirrus Windows build --- .cirrus.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 123b95ec7cfc..e2918bca58d6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -119,17 +119,19 @@ task: install_vcpkgs_script: # Add vcpkg packages - git clone https://github.com/microsoft/vcpkg - - .\vcpkg\bootstrap-vcpkg.bat - - .\vcpkg\vcpkg integrate install - - .\vcpkg\vcpkg install boost-process:x64-windows-static boost-variant:x64-windows-static boost-signals2:x64-windows-static boost-multi-index:x64-windows-static boost-test:x64-windows-static - - .\vcpkg\vcpkg install libevent:x64-windows-static sqlite3:x64-windows-static - - .\vcpkg\vcpkg install berkeleydb:x64-windows-static curl:x64-windows-static - - .\vcpkg\vcpkg install zeromq:x64-windows-static rapidcheck:x64-windows-static + - cd vcpkg + - git checkout 75522bb1f2e7d863078bcd06322348f053a9e33f + - .\bootstrap-vcpkg.bat + - .\vcpkg integrate install + - .\vcpkg install boost-process:x64-windows-static boost-variant:x64-windows-static boost-signals2:x64-windows-static boost-multi-index:x64-windows-static boost-test:x64-windows-static + - .\vcpkg install libevent:x64-windows-static sqlite3:x64-windows-static + - .\vcpkg install berkeleydb:x64-windows-static curl:x64-windows-static + - .\vcpkg install zeromq:x64-windows-static rapidcheck:x64-windows-static add_qt_script: # Add Qt libraries - choco install -y wget - - wget https://github.com/sipsorcery/qt_win_binary/releases/download/qt598x64_vs2019_v1681/qt598_x64_vs2019_1681.zip - - unzip qt598_x64_vs2019_1681.zip -d c:\Qt5.9.8_x64_static_vs2019 + - wget https://github.com/sipsorcery/qt_win_binary/releases/download/qt51210x64_vs2019_1694/Qt5.12.10_x64_static_vs2019_1694.zip + - unzip Qt5.12.10_x64_static_vs2019_1694.zip -d c:\Qt5.12.10_x64_static_vs2019_1694 build_script: # Build bitcoin - cd c:\bitcoin\build_msvc From bf8a2b3ea101000f6a3672d35713bc004dc21b55 Mon Sep 17 00:00:00 2001 From: Emma Wu Date: Fri, 23 Apr 2021 12:50:32 +0200 Subject: [PATCH 3/6] Remove git clone command --- .cirrus.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index e2918bca58d6..c5cb7be7b558 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -102,16 +102,14 @@ task: FILE_ENV: "./ci/test/00_setup_env_win64.sh" task: + env: + CIRRUS_WORKING_DIR: "c:\\" name: 'Win64 [installer]' timeout_in: 120m windows_container: image: cirrusci/windowsservercore:2019 cpu: 8 memory: 16G - clone_script: - - choco install -y git - - cd c:\ - - git clone -b %CIRRUS_BRANCH% %CIRRUS_REPO_CLONE_URL% install_script: # Install Vistual Studio build tools and other prerequisites - choco upgrade -y visualstudio2019-workload-vctools From f9110f08f4b2f95f915530af4ece0499e4380953 Mon Sep 17 00:00:00 2001 From: VanOrton <> Date: Fri, 23 Apr 2021 13:08:09 +0200 Subject: [PATCH 4/6] Updated path --- .cirrus.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c5cb7be7b558..64d4f406a9f0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -102,8 +102,6 @@ task: FILE_ENV: "./ci/test/00_setup_env_win64.sh" task: - env: - CIRRUS_WORKING_DIR: "c:\\" name: 'Win64 [installer]' timeout_in: 120m windows_container: @@ -132,19 +130,19 @@ task: - unzip Qt5.12.10_x64_static_vs2019_1694.zip -d c:\Qt5.12.10_x64_static_vs2019_1694 build_script: # Build bitcoin - - cd c:\bitcoin\build_msvc + - cd $env:CIRRUS_WORKING_DIR\build_msvc - py msvc-autogen.py - '"c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild" bitcoin.sln' prepare_installer_script: # Install NSIS and prepare msi package - choco install -y nsis - mkdir c:\binaries_windows - - cp c:\bitcoin\build_msvc\x64\Debug\bitcoind.exe c:\binaries_windows - - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-tx.exe c:\binaries_windows - - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-qt.exe c:\binaries_windows - - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-cli.exe c:\binaries_windows - - cp c:\bitcoin\build_msvc\x64\Debug\bitcoin-wallet.exe c:\binaries_windows - - cd c:\bitcoin\share + - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoind.exe c:\binaries_windows + - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-tx.exe c:\binaries_windows + - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-qt.exe c:\binaries_windows + - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-cli.exe c:\binaries_windows + - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-wallet.exe c:\binaries_windows + - cd $env:CIRRUS_WORKING_DIR\share - '"c:\Program Files (x86)\NSIS\makensis.exe" setup-bitcoin-win.nsi' task: From 3171d53122e147d9ad83d35a568f9daaa6c26781 Mon Sep 17 00:00:00 2001 From: VanOrton <> Date: Fri, 23 Apr 2021 13:11:42 +0200 Subject: [PATCH 5/6] trigger CI rebuild --- .appveyor.yml | 63 --------------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index fb95876c3677..000000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,63 +0,0 @@ -version: '{branch}.{build}' -skip_tags: true -image: Visual Studio 2019 -configuration: Release -platform: x64 -clone_depth: 5 -environment: - PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%' - PYTHONUTF8: 1 - QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/qt51210x64_vs2019_1694/Qt5.12.10_x64_static_vs2019_1694.zip' - QT_DOWNLOAD_HASH: '3035a1307e8302bb3a76eba9bb3102979f945ab4022cc3bc2e1583edd44bdc99' - QT_LOCAL_PATH: 'C:\Qt5.12.10_x64_static_vs2019_1694' - VCPKG_TAG: '75522bb1f2e7d863078bcd06322348f053a9e33f' -install: -# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes. -# - cmd: pip install zmq -# The powershell block below is to set up vcpkg to install the c++ dependencies. The pseudo code is: -# a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary, -# b. Append a setting to the vcpkg cmake config file to only do release builds of dependencies (skipping deubg builds saves ~5 mins). -# Note originally this block also installed the dependencies using 'vcpkg install'. Dependencies are now installed -# as part of the msbuild command using vcpkg mainfests. -- ps: | - cd c:\tools\vcpkg - $env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead. - git -c advice.detachedHead=false checkout $env:VCPKG_TAG - .\bootstrap-vcpkg.bat > $null - Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)" - cd "$env:APPVEYOR_BUILD_FOLDER" -before_build: -# Powershell block below is to download and extract the Qt static libraries. The pseudo code is: -# a. Download the zip file with the prebuilt Qt static libraries. -# b. Check that the downloaded file matches the expected hash. -# c. Extract the zip file to the specific destination path expected by the msbuild projects. -- ps: | - Write-Host "Downloading Qt binaries."; - Invoke-WebRequest -Uri $env:QT_DOWNLOAD_URL -Out qtdownload.zip; - Write-Host "Qt binaries successfully downloaded, checking hash against $env:QT_DOWNLOAD_HASH..."; - if((Get-FileHash qtdownload.zip).Hash -eq $env:QT_DOWNLOAD_HASH) { - Expand-Archive qtdownload.zip -DestinationPath $env:QT_LOCAL_PATH; - Write-Host "Qt binary download matched the expected hash."; - } - else { - Write-Host "ERROR: Qt binary download did not match the expected hash."; - Exit-AppveyorBuild; - } -- cmd: python build_msvc\msvc-autogen.py -build_script: -- cmd: msbuild /p:TrackFileAccess=false build_msvc\bitcoin.sln /m /v:q /nologo -after_build: -#- 7z a bitcoin-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe -test_script: -- cmd: src\test_bitcoin.exe -l test_suite -- cmd: src\bench_bitcoin.exe > NUL -- ps: python test\util\bitcoin-util-test.py -- cmd: python test\util\rpcauth-test.py -# Fee estimation test failing on appveyor with: WinError 10048] Only one usage of each socket address (protocol/network address/port) is normally permitted. -# functional tests disabled for now. See -# https://github.com/bitcoin/bitcoin/pull/18626#issuecomment-613396202 -# https://github.com/bitcoin/bitcoin/issues/18623 -# - cmd: python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --failfast --exclude feature_fee_estimation -artifacts: -#- path: bitcoin-%APPVEYOR_BUILD_VERSION%.zip -deploy: off From e16878364e5f8a3d3d61420a5fd924a09ae0fdd9 Mon Sep 17 00:00:00 2001 From: VanOrton <> Date: Fri, 23 Apr 2021 13:41:10 +0200 Subject: [PATCH 6/6] Fix paths --- .cirrus.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 64d4f406a9f0..0829157dbd5e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -108,6 +108,8 @@ task: image: cirrusci/windowsservercore:2019 cpu: 8 memory: 16G + env: + CIRRUS_WORKING_DIR: "C:\\Windows\\Temp\\bitcoin" install_script: # Install Vistual Studio build tools and other prerequisites - choco upgrade -y visualstudio2019-workload-vctools @@ -130,19 +132,19 @@ task: - unzip Qt5.12.10_x64_static_vs2019_1694.zip -d c:\Qt5.12.10_x64_static_vs2019_1694 build_script: # Build bitcoin - - cd $env:CIRRUS_WORKING_DIR\build_msvc + - cd c:\Windows\Temp\bitcoin\build_msvc - py msvc-autogen.py - '"c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild" bitcoin.sln' prepare_installer_script: # Install NSIS and prepare msi package - choco install -y nsis - mkdir c:\binaries_windows - - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoind.exe c:\binaries_windows - - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-tx.exe c:\binaries_windows - - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-qt.exe c:\binaries_windows - - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-cli.exe c:\binaries_windows - - cp $env:CIRRUS_WORKING_DIR\build_msvc\x64\Debug\bitcoin-wallet.exe c:\binaries_windows - - cd $env:CIRRUS_WORKING_DIR\share + - cp c:\Windows\Temp\bitcoin\build_msvc\x64\Debug\bitcoind.exe c:\binaries_windows + - cp c:\Windows\Temp\bitcoin\build_svc\x64\Debug\bitcoin-tx.exe c:\binaries_windows + - cp c:\Windows\Temp\bitcoin\build_msvc\x64\Debug\bitcoin-qt.exe c:\binaries_windows + - cp c:\Windows\Temp\bitcoin\build_msvc\x64\Debug\bitcoin-cli.exe c:\binaries_windows + - cp c:\Windows\Temp\bitcoin\build_msvc\x64\Debug\bitcoin-wallet.exe c:\binaries_windows + - cd c:\Windows\Temp\bitcoin\share - '"c:\Program Files (x86)\NSIS\makensis.exe" setup-bitcoin-win.nsi' task: