Skip to content

Commit 6ca2a17

Browse files
committed
Move conda build from azure pipelines into separate repository, remove OS X specific hacks
1 parent 8796c4c commit 6ca2a17

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,27 @@ trigger:
33

44
variables:
55
cmakeargs: '-DCMAKE_BUILD_TYPE=Release'
6-
build_conda: 'false' # quite slow, has to be enable manually
76
jobs:
87
- job: Linux
98
pool:
109
vmImage: 'ubuntu-16.04'
1110
steps:
1211
- template: ci/azure_build_steps.yml
13-
parameters:
14-
conda: $[ build_conda ]
1512
- job: Windows
1613
pool:
1714
vmImage: 'vs2017-win2016'
1815
steps:
1916
- template: ci/azure_build_steps.yml
2017
parameters:
2118
cpack: false # cpack points to the wrong cpack
22-
conda: $[ build_conda ]
2319
- job: macOS
2420
pool:
25-
vmImage: 'macOS-10.14'
21+
vmImage: 'macOS-10.13'
2622
steps:
2723
- template: ci/azure_build_steps.yml
2824
parameters:
2925
run_tests: true
3026
cmake_stepvars: '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=1 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW'
31-
conda: false # fails for some unknown reason
3227
- job: manylinux
3328
pool:
3429
vmImage: 'ubuntu-16.04'
@@ -41,7 +36,6 @@ jobs:
4136
- template: ci/azure_build_steps.yml
4237
parameters:
4338
cpack: false
44-
conda: false
4539
cmake_stepvars: '-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=1 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -G Ninja'
4640
- publish: build/install/lib/liblsl64.so
4741
artifact: liblsl_manylinux2010_x64.so

ci/azure_build_steps.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
cpack: true
3-
conda: true
43
run_tests: true
54
cmake_stepvars: ''
65
steps:
@@ -15,15 +14,6 @@ steps:
1514
inputs:
1615
cmakeArgs: '--build . --config Release -j --target install'
1716
displayName: 'Build files'
18-
- ${{ if eq(parameters.conda, 'true') }}:
19-
- task: CondaEnvironment@1
20-
inputs:
21-
packageSpecs: conda-build
22-
displayName: set up anaconda
23-
- bash: conda build conda --output-folder condaoutput
24-
displayName: 'build conda package'
25-
- publish: condaoutput
26-
artifact: '$(Agent.JobName)_conda'
2717
- ${{ if eq(parameters.cpack, 'true') }}:
2818
- bash: cpack
2919
workingDirectory: 'build'

conda/meta.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build:
1414
string: {{ GIT_BUILD_STR }}
1515
script:
1616
- mkdir build
17-
- 'cmake -DLSL_UNIXFOLDERS=1 -G Ninja -DCMAKE_INSTALL_PREFIX:PATH="{{ PREFIX }}" -DCMAKE_INSTALL_RPATH:PATH="{{ PREFIX }}/lib" -DCMAKE_PREFIX_PATH:PATH="{{ environ.get("_CONDA_PREFIX") }}" -S . -B build'
17+
- 'cmake -DLSL_UNIXFOLDERS=1 -DCMAKE_INSTALL_PREFIX:PATH="{{ PREFIX }}" -DCMAKE_INSTALL_RPATH:PATH="{{ PREFIX }}/lib" -S . -B build -G Ninja'
1818
- 'cmake --build build -j --target install'
1919

2020
requirements:
@@ -23,6 +23,11 @@ requirements:
2323
- {{ compiler("cxx") }}
2424
- git
2525
- ninja
26+
host:
27+
28+
tests:
29+
commands:
30+
- lslver
2631

2732
about:
2833
home: https://github.com/sccn/liblsl

0 commit comments

Comments
 (0)