Update script

Author: mickaelbaron

.github/workflows/main-workflow-template.yml

@@ -15,15 +15,7 @@ on:
         description: Name of the base image
         required: true
         type: string
-      java_version_1:
-        description: context of docker image
-        required: false
-        type: string
-      java_version_2:
-        description: context of docker image
-        required: false
-        type: string
-      java_version_3:
+      java_versions:
         description: context of docker image
         required: false
         type: string
@@ -45,9 +37,7 @@ jobs:
     - id: set-matrix
       run: |
         matrix=$(python utils/generate-matrix.py --input_image ${{ inputs.base_image }} --output_image ${{ inputs.image }} \
-                 --java_version_1 ${{ inputs.java_version_1 }} --java_version_2 ${{ inputs.java_version_2 }} \
-                 --java_version_3 ${{ inputs.java_version_3 }} \
-                 --dh_orga liaslaboratory --images_prefix onyxia )
+                 --dh_orga liaslaboratory --images_prefix onyxia --java_versions ${{ inputs.java_versions }} )
         echo $matrix
         echo "matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
 

.github/workflows/main-workflow.yml

@@ -12,7 +12,5 @@ jobs:
       image: java-minimal
       context: java-minimal
       base_image: base
-      java_version_1: 11
-      java_version_2: 17
-      java_version_3: 20
+      java_versions: 11,17,20
     secrets: inherit

utils/generate-matrix.py

@@ -36,15 +36,14 @@ def generate_matrix(versions, input_image, output_image, version_prefix):
     parser = argparse.ArgumentParser()
     parser.add_argument("--input_image", type=str)
     parser.add_argument("--output_image", type=str)
-    parser.add_argument("--java_version_1", type=str, nargs="?", const="")
-    parser.add_argument("--java_version_2", type=str, nargs="?", const="")
-    parser.add_argument("--java_version_3", type=str, nargs="?", const="")
     parser.add_argument("--dh_orga", type=str)
     parser.add_argument("--images_prefix", type=str)
+    parser.add_argument("--java_versions", type=str, nargs="?", const="")
 
     args = parser.parse_args()
-    java_versions = [version for version in [args.java_version_1, args.java_version_2, args.java_version_3]
-                       if version]
+
+    if args.java_versions:
+        java_versions = args.java_versions.split(",")
 
     DH_ORGA = args.dh_orga.lower()
     TODAY_DATE = datetime.today().strftime('%Y.%m.%d')