Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Lima-camera-andor3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LimaGroup
Lima-camera-andor3
Commits
5730aedb
Commit
5730aedb
authored
2 months ago
by
Laurent Claustre
Browse files
Options
Downloads
Plain Diff
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
!9
Resolve "recompile for lima 1.10"
Pipeline
#204529
passed
2 months ago
Stage: build
Stage: build-noarch
Stage: deploy
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
conda/camera/conda_build_config.yaml
+1
-0
1 addition, 0 deletions
conda/camera/conda_build_config.yaml
conda/camera/meta.yaml
+2
-2
2 additions, 2 deletions
conda/camera/meta.yaml
conda/tango/meta.yaml
+1
-1
1 addition, 1 deletion
conda/tango/meta.yaml
with
6 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
0
View file @
5730aedb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
conda/camera/conda_build_config.yaml
+
1
−
0
View file @
5730aedb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
conda/camera/meta.yaml
+
2
−
2
View file @
5730aedb
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
conda/tango/meta.yaml
+
1
−
1
View file @
5730aedb
...
...
@@ -22,7 +22,7 @@ requirements:
-
ninja
-
lima-core
run
:
-
lima-tango-server
-
lima-tango-server
1.10*
-
lima-camera-andor3
about
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment