Merge pull request #26 from ThatMG393/main

Fix build when `all` architecture is used

Author: SaicharanKandukuri

.github/workflows/build-and-release.yml

@@ -50,7 +50,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.suite }}-${{ matrix.architecture }}-tarballs
-          path: fs-cook/out/${{ matrix.suite }}-${{ matrix.variant }}-${{ matrix.architecture }}.tar.gz
+          path: fs-cook/out/${{ matrix.suite }}-${{ matrix.variant }}-**.tar.gz
 
   create-release:
     runs-on: ubuntu-latest

gen_data/gen-suite-matrix.py

@@ -3,12 +3,14 @@
 
 SUITES_DIR="./suites/*"
 
-# ARCHITECTURE CAN BE: all, amd64, arm64, armhf
+# ARCHITECTURE CAN BE: amd64, arm64, armhf
 # it has high priority over the architecture specified in the suite
 # set it to "all" to build all architectures defined in the <suite>/<varient>.sh file
-ARCHITECTURES = [ "all" ]
+# "all" is currently broken!
+ARCHITECTURES = [ "all" ] #, "arm64", "armhf" ]
 
-def generate_matrix_json() -> None:
+# Can be moved to utils?
+def generate_matrix_json() -> str:
 	json_data = { "include": [ ] }
 
 	for arch in ARCHITECTURES:
@@ -24,7 +26,7 @@ def generate_matrix_json() -> None:
 
 			json_data['include'].append(element)
 
-	print(json.dumps(json_data, sort_keys=True, indent=None, separators=(',', ':')))
+	return json.dumps(json_data, indent=None)
 
 if __name__ == '__main__':
-	generate_matrix_json()
+	print(generate_matrix_json())