CI: Use BF2/IRA multibuild instead of separate builds

Nothing CI ever works first try.

Author: BlockBuilder57

.github/workflows/ci.yml

@@ -37,18 +37,12 @@ jobs:
       # These run in parallel.
       matrix:
         build:
-          - name: debug-bf2
-            preset: debug-bf2
-            codename: bf2
-          - name: release-bf2
-            preset: release-bf2
-            codename: bf2
-          - name: debug-ira
-            preset: debug-ira
-            codename: ira
-          - name: release-ira
-            preset: release-ira
-            codename: ira
+          - name: debug-bf2_ira
+            preset: debug-bf2_ira
+            codename: bf2;ira
+          - name: release-bf2_ira
+            preset: release-bf2_ira
+            codename: bf2;ira
           - name: debug-bfsw
             preset: debug-bfsw
             codename: bfsw
@@ -95,7 +89,7 @@ jobs:
         id: package
         run: |
           cd build-${{matrix.build.preset}}
-          python3 ../scripts/makePackage.py --json ../npdm/${{matrix.build.codename}}.json
+          python3 ../scripts/makePackage.py --codename "${{matrix.build.codename}}"
           cd pkg
           zip -9r ../xenomods-${{matrix.build.preset}}.zip .
 

scripts/makePackage.py

@@ -10,7 +10,6 @@
 from shutil import copyfile
 from pathlib import Path
 
-
 # bail (printing a message beforehand) and exit
 def Bail(message):
     print(f'Error: {message}')
@@ -21,29 +20,33 @@ def Bail(message):
     parser = argparse.ArgumentParser(description='Script for packaging.')
 
     # stuff we gather from
-    parser.add_argument('--json', dest='path', required=True, type=str, help='path to npdmtool JSON file to gather information from')
+    parser.add_argument('--codename', dest='codename', required=True, type=str, help='codename(s) of the build type')
     parser.add_argument('--subsdk', dest='subsdk_name', required=False, type=str, default="subsdk9", help='subsdk name (default \'subsdk9\')')
 
     args = parser.parse_args()
 
-    if not os.path.exists(args.path):
-        Bail("JSON file doesn't exist")
+    for codename in args.codename.split(';'):
+        print(f"Codename: {codename}")
+        npdmPath = Path(os.getcwd()) / f"../npdm/{codename}.json"
+
+        if not os.path.exists(npdmPath):
+            Bail("NPDM JSON file doesn't exist")
 
-    with open(args.path, mode='r') as file:
-        # additionaly if it doesn't have json data, it probably shouldn't be used either, bail there too.
-        try:
-            jsondata = json.loads(file.read())
-        except:
-            Bail("JSON file contains invalid data")
+        with open(npdmPath, mode='r') as file:
+            # additionaly if it doesn't have json data, it probably shouldn't be used either, bail there too.
+            try:
+                jsondata = json.loads(file.read())
+            except:
+                Bail("NPDM JSON file contains invalid data")
 
-    programid = jsondata['program_id'][2:].upper()
+        programid = jsondata['program_id'][2:].upper()
 
-    print(f"Gathered program id is {programid}")
+        print(f"Gathered program id is {programid}")
 
-    amspath = Path(os.getcwd()) / 'pkg' / 'atmosphere' / 'contents' / programid / 'exefs'
-    amspath.mkdir(parents=True)
+        amspath = Path(os.getcwd()) / 'pkg' / 'atmosphere' / 'contents' / programid / 'exefs'
+        amspath.mkdir(parents=True)
 
-    copyfile('xenomods.nso', str(amspath / args.subsdk_name))
-    copyfile('main.npdm', str(amspath / 'main.npdm'))
+        copyfile('xenomods.nso', str(amspath / args.subsdk_name))
+        copyfile(f'{codename}.npdm', str(amspath / 'main.npdm'))
 
     print('Generated package data')