diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fdb8ab046e694ad5898d591d53a1c019d03153f..df5d306ca138bbbfe800b02002e780d6cde4a1b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - build + - build-noarch - deploy .build-conda: &build-conda @@ -19,8 +20,11 @@ build-linux: build-noarch: <<: *build-conda + stage: build-noarch script: - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable + dependencies: + - build-linux deploy-devel: stage: deploy diff --git a/conda/camera/conda_build_config.yaml b/conda/camera/conda_build_config.yaml index 9bad8deb104c8b9f100c829d6ece49c6dd35b425..f2d01bf9b618cc73c4bfca819491f694e4f10517 100644 --- a/conda/camera/conda_build_config.yaml +++ b/conda/camera/conda_build_config.yaml @@ -5,6 +5,7 @@ c_compiler: cxx_compiler: - vs2017 # [win] python: + - 2.7 # [linux] - 3.6 # This differs from target_platform in that it determines what subdir the compiler # will target, not what subdir the compiler package will be itself. diff --git a/conda/camera/meta.yaml b/conda/camera/meta.yaml index 48a141a0674703c1ae206a69945e06e999f11c03..da778d255ab5e957b13b6e3d9e49ad81e294c7a8 100644 --- a/conda/camera/meta.yaml +++ b/conda/camera/meta.yaml @@ -11,20 +11,20 @@ build: number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }} requirements: - build: - - git - - cmake - - {{ compiler('cxx') }} - - lima-core host: - python {{ python }} - numpy - - sip 4.18* #For the SIP generator + - sip 4.19.8 # For compatibility with pyqt 5.9.2 + - lima-core - libv4l + build: + - git + - cmake + - {{ compiler('cxx') }} run: - python {{ python }} - - sip 4.18* #For the SIP module - - lima-core + - sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2 + - {{ pin_compatible('lima-core', max_pin='x.x') }} - libv4l test: