Skip to content

Commit

Permalink
CI: appveyor improvements, conditional deployments
Browse files Browse the repository at this point in the history
  • Loading branch information
tstenner committed May 30, 2018
1 parent 06a6e9c commit a26b328
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ matrix:
apt:
packages:
- qt5-default
- libboost-thread-dev
- libboost-filesystem-dev
- libboost-iostreams-dev
before_script:
Expand Down
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ if(NOT TARGET LSL::lsl)
endif()

# GENERAL CONFIG #
cmake_policy(SET CMP0028 NEW) # ENABLE CMP0028: Double colon in target name means ALIAS or IMPORTED target.
cmake_policy(SET CMP0054 NEW) # ENABLE CMP0054: Only interpret if() arguments as variables or keywords when unquoted.
cmake_policy(SET CMP0063 NEW) # ENABLE CMP0063: Honor visibility properties for all target types.
cmake_policy(SET CMP0042 NEW) # ENABLE CMP0042: MACOSX_RPATH is enabled by default.

# Meta information about the project
set(META_PROJECT_DESCRIPTION "Record LabStreamingLayer streams to XDF data file.")

Expand All @@ -33,7 +28,7 @@ find_package(Qt5 REQUIRED COMPONENTS Network Widgets)
# APPLICATION #

# Target name
set(target LabRecorder)
set(target ${PROJECT_NAME})

# Build executable
add_executable(${target}
Expand Down
13 changes: 9 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ pull_requests:
do_not_increment_build_number: true
shallow_clone: true
environment:
lslversion: 1.12.0
VCVER: 14.0
QTVER: 5.10.1
QTCOMPILER: msvc2015_64
ARCH: x64
CMakeArgs: ""
DODEPLOY: false
install:
- cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip -FileName ninja.zip
- cmd: appveyor DownloadFile https://bintray.com/labstreaminglayer/LSL/download_file?file_path=liblsl-1.12.0-Win64-MSVC%VCVER%.7z -FileName liblsl_x64.7z
- cmd: appveyor DownloadFile https://bintray.com/labstreaminglayer/LSL/download_file?file_path=liblsl-%lslversion%-Win64-MSVC%VCVER%.7z -FileName liblsl_x64.7z
- cmd: 7z x ninja.zip -oC:\projects\deps\ninja > nul
- cmd: 7z x liblsl_x64.7z
- cmd: set PATH=C:\projects\deps\ninja;%PATH%
Expand All @@ -19,18 +21,21 @@ build_script:
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio %VCVER%\VC\vcvarsall.bat" %ARCH%
- mkdir build
- cd build
- cmd: cmake -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_63_0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% ../
- cmd: cmake -G Ninja -DQt5_DIR=C:/Qt/%QTVER%/%QTCOMPILER%/lib/cmake/Qt5 -DBOOST_ROOT=C:/Libraries/boost_1_67_0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DLSL_INSTALL_ROOT=LSL/ %CMakeArgs% ../
- cmake --build . --config Release --target install
artifacts:
- path: build/install
name: LabRecorder-1.12.0-Win64
name: LabRecorder_$(lslversion)-Win64
deploy:
- provider: BinTray
username: tstenner
api_key:
secure: Fo9tIQnGjVnCXB3euItvYrt85A5O9FPqq7LEpsdOuwW+eOg1rwA5Q1HLp4yWDXAl
subject: labstreaminglayer
version: 1.12
version: $(lslversion)
repo: LSL
package: LabRecorder
publish: true
override: true
on:
dodeploy: true

0 comments on commit a26b328

Please sign in to comment.