Skip to content
Snippets Groups Projects
Commit 5730aedb authored by Laurent Claustre's avatar Laurent Claustre
Browse files

Merge branch '2-recompile-for-lima-1-10' into 'master'

Resolve "recompile for lima 1.10"

Closes #2

See merge request !9
parents 39ee778f 73db9e43
Branches master
Tags v1.12.0
1 merge request!9Resolve "recompile for lima 1.10"
Pipeline #204529 passed
......@@ -25,6 +25,8 @@ build-noarch:
- conda mambabuild ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
tags:
- linux
deploy-devel:
stage: deploy
......
......@@ -6,6 +6,7 @@ cxx_compiler:
- vs2017 # [win]
python:
- 3.9
- 3.10
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -19,7 +19,7 @@ requirements:
host:
- python {{ python }}
- sip 4.19*
- lima-core >=1.9.20
- lima-core 1.10*
- andor3-sdk 3.15.30092.2
build:
- ninja
......@@ -28,7 +28,7 @@ requirements:
run:
- python
- {{ pin_compatible('sip', min_pin='x.x.x', max_pin='x') }}
- {{ pin_compatible('lima-core', max_pin='x.x') }}
- {{ pin_compatible('lima-core', min_pin='x.x', max_pin='x.x') }}
- andor3-sdk 3.15.30092.2
test:
......
......@@ -22,7 +22,7 @@ requirements:
- ninja
- lima-core
run:
- lima-tango-server
- lima-tango-server 1.10*
- lima-camera-andor3
about:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment