This commit is contained in:
Erik Frojdh
2020-04-14 16:49:51 +02:00
parent ec21624aeb
commit 876207c8cd
2 changed files with 6 additions and 6 deletions

View File

@ -41,4 +41,4 @@ deploy:
provider: script provider: script
script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \;
on: on:
branch: 4.1.1 branch: 4.2.0

View File

@ -1,12 +1,12 @@
package: package:
name: sls_detector_software name: sls_detector_software
version: 4.1.1 version: 4.2.0
source: source:
- path: .. - path: ..
build: build:
number: 1 number: 0
rpaths: rpaths:
- lib/ - lib/
@ -50,14 +50,14 @@ requirements:
outputs: outputs:
- name: sls_detector_lib - name: sls_detector_lib
version: 4.1.1 version: 4.2.0
script: copy_lib.sh script: copy_lib.sh
requirements: requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
- name: sls_detector_gui - name: sls_detector_gui
version: 4.1.1 version: 4.2.0
script: copy_gui.sh script: copy_gui.sh
requirements: requirements:
build: build:
@ -81,5 +81,5 @@ outputs:
- {{ cdt('libxdamage') }} # [linux] - {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux]
run: run:
- sls_detector_lib=4.1.1 - sls_detector_lib=4.2.0
- qwt 6.1.4=hf484d3e_1001 - qwt 6.1.4=hf484d3e_1001