Distinguish compose with and without features in jobs

.gitlab-ci.yml

@@ -82,6 +82,22 @@ sbt-prepare:
     - tapasco -v import $TAPASCO_HOME/common/ip/precision_counter.zip as 14 -a $ARCHS -p $PLATFORMS
 
 .compose-template: &compose-definition
+  <<: *template
+  stage: compose
+  cache:
+      untracked: true
+      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
+      policy: pull
+  script:
+    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
+    - |
+      if [ ! -d ".ivy2" ]; then
+        echo "Cache not available"
+        sbt assembly
+      fi
+    - tapasco -v --maxTasks 1 compose [arraysum x 1, arrayupdate x 1] @ 100 MHz -a $ARCHS -p $PLATFORMS
+
+.compose-features-template: &compose-features-definition
   <<: *template
   stage: compose
   cache:

gitlab-ci-base.yml

@@ -82,6 +82,22 @@ sbt-prepare:
     - tapasco -v import $TAPASCO_HOME/common/ip/precision_counter.zip as 14 -a $ARCHS -p $PLATFORMS
 
 .compose-template: &compose-definition
+  <<: *template
+  stage: compose
+  cache:
+      untracked: true
+      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
+      policy: pull
+  script:
+    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
+    - |
+      if [ ! -d ".ivy2" ]; then
+        echo "Cache not available"
+        sbt assembly
+      fi
+    - tapasco -v --maxTasks 1 compose [arraysum x 1, arrayupdate x 1] @ 100 MHz -a $ARCHS -p $PLATFORMS
+
+.compose-features-template: &compose-features-definition
   <<: *template
   stage: compose
   cache: