Cleanup & simplify more

.gitlab-ci.yml

@@ -7,18 +7,25 @@ make-targets:
         | jq -r 'map(.tag_name | split(".") | {"maj":.[0:2], "pat":.}) | group_by(.maj) | .[] | max | .pat | join(".")'
         | tail -n +3
         > versions
-    - sed "s/%LATEST_OCAML_VERSION%/$(tail -n1 versions)/g" ocaml-image.yml.pre > ocaml-images.yml
     - for v in $(cat versions); do
-          sed "s/%OCAML_VERSION%/$v/g" ocaml-image.yml.in >> ocaml-images.yml;
-        done
+          echo "ocaml-image-$v:";
+          echo "  extends: .ocaml-image";
+          echo "  variables:";
+          echo "    OCAML_VERSION: $v";
+          echo;
+        done > ocaml-images.yml
+    - echo "variables:"  >> ocaml-images.yml
+    - echo "  LATEST_OCAML_VERSION: $(tail -n1 versions)"  >> ocaml-images.yml
   artifacts:
     paths:
-      - ocaml-images.yml
+      - ocaml-images-list.yml
 
 build-images:
   stage: build
+  variables:
   trigger:
     include:
+      - local: ocaml-images-gen.yml
       - artifact: ocaml-images.yml
         job: make-targets
     strategy: depend

ocaml-image.yml.in

-
-ocaml-image-%OCAML_VERSION%:
-  extends: .ocaml-image
-  variables:
-    OCAML_VERSION: %OCAML_VERSION%
-    LATEST_OCAML_VERSION: %LATEST_OCAML_VERSION%