Correct composition of the ts_idl version.

lsst-ts · Jul 4, 2022 · 2eb95ec · 2eb95ec
1 parent 1111db4
commit 2eb95ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build/sal-sciplat/Dockerfile b/build/sal-sciplat/Dockerfile
@@ -45,7 +45,7 @@ RUN source ${SALSTACK} && \
     conda install -c lsstts -y \
     ts-dds=${osplice_v}=${osplice_py} \
     ts-ddsconfig=${ts_ddsconfig} \
-    ts-idl=${ts_idl}_${ts_xml}_${ts_sal} \
+    ts-idl=${ts_idl}=${ts_xml}_${ts_sal} \
     ts-salobj=${ts_salobj} \
     ts-atdome=${ts_atdome} \
     ts-atdometrajectory=${ts_atdometrajectory} \

diff --git a/cycle/docker-compose.yaml b/cycle/docker-compose.yaml
@@ -623,7 +623,7 @@ services:
         dds_private_build: ${dds_private_build}
         ts_dds: ${ts_dds_private}=${ts_dds_private_conda_build}
         ts_ddsconfig: ${ts_ddsconfig}
-        ts_idl: ${ts_idl}_${ts_xml}_${ts_sal}
+        ts_idl: ${ts_idl}=${ts_xml}_${ts_sal}
         ts_utils: ${ts_utils}
         ts_salobj: ${ts_salobj}
 
@@ -658,7 +658,7 @@ services:
         ts_utils: ${ts_utils}
         ts_salobj: ${ts_salobj}
         ts_dds: ${ts_dds_private}
-        ts_idl: ${ts_idl}_${ts_xml}_${ts_sal}
+        ts_idl: ${ts_idl}=${ts_xml}_${ts_sal}
         ts_ddsconfig: ${ts_ddsconfig}
 
   docker-compose-aarch64:

diff --git a/recipe/ts_cycle/setup.py b/recipe/ts_cycle/setup.py
@@ -14,7 +14,7 @@
 
 version = f"{int(env_vars['CYCLE'][1:])}.0.0"
 ts_ddsconfig_version = env_vars["ts_ddsconfig"]
-ts_idl_version = f"{env_vars['ts_idl']}_{env_vars['ts_xml']}_{env_vars['ts_sal']}"
+ts_idl_version = f"{env_vars['ts_idl']}={env_vars['ts_xml']}_{env_vars['ts_sal']}"
 ts_salobj_version = env_vars["ts_salobj"]
 
 setup(