Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Build/debug beta (#1696)

Browse source 
* Build RelWithDebInfo for beta

* Update appveyor.yml

capture artifacts based on build type
This commit is contained in:
Russel Waters 2019-02-04 15:02:22 -05:00 • committed by GitHub
commit 5b7ff77e59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
appveyor.yml
View file

@ -9,15 +9,15 @@ platform: x64
environment:
matrix:
- network: nano_live_network
configuration: Release
- network: nano_beta_network
configuration: RelWithDebInfo
clone_folder: C:\projects\myproject
install:
- cmd: >-
git submodule update --init --recursive
cmake -DNANO_GUI=ON -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib"
cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib"
- ps: Invoke-WebRequest -Uri https://aka.ms/vs/15/release/vc_redist.x64.exe -OutFile .\vc_redist.x64.exe
build:
@ -26,11 +26,11 @@ build:
verbosity: minimal
after_build:
- cmd: >-
cpack -NSIS --verbose
cpack -C %CONFIGURATION% --verbose --config ./CPackConfig.cmake
7z a nano.zip %APPVEYOR_BUILD_FOLDER%\Release\*.exe %APPVEYOR_BUILD_FOLDER%\Release\*.com
7z a nano.zip %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.exe %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.com
artifacts:
- path: nano.zip
name: nano_release_%network%
- path: Nano_Installer-*.exe
name: Nano_Installer_%network%
name: Nano_Installer_%network%

6
ci/build-gitlab.sh
View file

@ -54,8 +54,10 @@ fi
if [[ "${BETA}" -eq 1 ]]; then
NETWORK_CFG="-DACTIVE_NETWORK=nano_beta_network"
CONFIGURATION="RelWithDebInfo"
else
NETWORK_CFG="-DACTIVE_NETWORK=nano_live_network"
CONFIGURATION="Release"
fi
set -o nounset
@ -67,7 +69,7 @@ run_build() {
cd ${build_dir}
cmake -GNinja \
-DNANO_GUI=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=${CONFIGURATION} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX="../install" \
${NETWORK_CFG} \
@ -80,7 +82,7 @@ run_build() {
cmake --build ${PWD} -- -v
cmake --build ${PWD} -- install -v
cpack -G ${CPACK_TYPE} ${PWD}
cpack -G ${CPACK_TYPE} -C ${CONFIGURATION} ${PWD}
sha1sum *.tar* > SHA1SUMS
}