handle multiple artifact uploads

Author: dpomier

.github/workflows/ci.yml

@@ -872,18 +872,28 @@ jobs:
           otool -L ./haxe
           otool -L ./haxelib
 
+      - name: Upload Ecso
+        uses: actions/upload-artifact@v4
+        with:
+          name: ecso-mac
+          path: plugins/ecso/**/*.cmxs
+          if-no-files-found: error
+      
+
       - name: Upload artifact (x64)
         if: runner.arch == 'X64'
         uses: actions/upload-artifact@v4
         with:
           name: macX64Binaries
+          retention-days: 1
           path: out
 
       - name: Upload artifact (arm)
         if: runner.arch == 'ARM64'
         uses: actions/upload-artifact@v4
         with:
           name: macArmBinaries
+          retention-days: 1
           path: out
 
 

.github/workflows/release.yml

@@ -853,19 +853,13 @@ jobs:
           otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac/plugin.cmxs
           ls -l out
 
-      - name: Upload artifact (x64)
-        if: runner.arch == 'X64'
-        uses: actions/upload-artifact@v4
-        with:
-          name: macX64Binaries
-          path: out
-
-      - name: Upload artifact (arm)
-        if: runner.arch == 'ARM64'
+      - name: Upload Ecso
         uses: actions/upload-artifact@v4
         with:
-          name: macArmBinaries
-          path: out
+          name: ecso-mac-x64
+          path: plugins/ecso/**/*.cmxs
+          if-no-files-found: error
+      
 
 
   mac-x64-4-3-7-test:
@@ -1073,19 +1067,13 @@ jobs:
           otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac/plugin.cmxs
           ls -l out
 
-      - name: Upload artifact (x64)
-        if: runner.arch == 'X64'
-        uses: actions/upload-artifact@v4
-        with:
-          name: macX64Binaries
-          path: out
-
-      - name: Upload artifact (arm)
-        if: runner.arch == 'ARM64'
+      - name: Upload Ecso
         uses: actions/upload-artifact@v4
         with:
-          name: macArmBinaries
-          path: out
+          name: ecso-mac-arm64
+          path: plugins/ecso/**/*.cmxs
+          if-no-files-found: error
+      
 
 
   mac-arm64-4-3-7-test:

extra/github-actions/Main.hx

@@ -38,8 +38,8 @@ typedef Job = {
 @:nullSafety
 class Main {
 	static final matchHaxeCheckout = ~/([\r\n]\s*)-\s*uses\s*:\s*(actions\/checkout@[A-Za-z0-9.]+)\s*[\r\n](.|\r|\n)+?(?=(\r|\n)\s*-)/gm;
-	static final matchXmldocTasks = ~/([\r\n]\s*)-\s*name:[\w\s]+xmldoc[\w\s]+\s*:\s*[\w\W]+?(?=\n\n|\n\s*-)/gm;
-	static final matchUploadArtifact = ~/([\r\n]\s*)-\s*name:[\w\s]+\s*:\s*(actions\/upload-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([\w${}. |&'=()]+)[\w\W]+?(?=\n\n|\n\s*-)/gm;
+	static final matchXmldocTasks = ~/([\r\n]\s*)-\s*name:[\w\s()]+xmldoc[\w\s]+\s*:\s*[\w\W]+?(?=\n\n|\n\s*-)/gm;
+	static final matchUploadArtifact = ~/([\r\n]\s*)-\s*name:[\w\s():.='|&]+\s*:\s*(actions\/upload-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([\w${}. |&'=()]+)[\w\W]+?(?=\n\n|\n\s*-)/gm;
 	static final matchDownloadArtifact = ~/([\r\n]\s*)-\s*uses\s*:\s*(actions\/download-artifact@[A-Za-z0-9.]+)\s*[\w\W\r\n]+?(?=\sname:)\sname:\s([\w${}. |&'=()]+)/gm;
 	static final matchHaxeTests = ~/([\r\n]\s*)-\s*name: (Test[\w ()-]*)\s*[\n][\w\W]+?(?=haxe)(haxe RunCi\.hxml)[\w\W]+?(?=working-directory:)(working-directory:\s*([\w${}.\/ ]+))[\w\W]+?(?=\n\n|\n\s*-)/gm;
 	static final matchHaxeTargets = ~/[\r\n\s]target:\s*\[([\w,\s'"]*)\]/gm;
@@ -339,6 +339,7 @@ class Main {
 		});
 
 		// Upload artifact
+		var ecsoUploaded = false;
 		script = map(matchUploadArtifact, script, function(reg:EReg) {
 			var matched = reg.matched(0);
 			if (matched.contains("xmldoc"))
@@ -348,14 +349,22 @@ class Main {
 			var name = reg.matched(3);
 			var tab = head.substr(head.lastIndexOf('\n') + 1);
 
-			var uploadEcso = File.getContent('./upload-cmxs.yml').replace('::ARTIFACT_NAME::', "ecso-" + manifest.name);
 			var uploadHaxe = if (manifest.haxeDownload == null) {
 				matched.replace(name, '$name\n$tab    retention-days: 1');
 			} else {
 				'';
 			};
 
-			return align(uploadEcso, head) + uploadHaxe;
+			// make sure to upload ecso only once
+			var uploadEcso = if(!ecsoUploaded) {
+				ecsoUploaded = true;
+				var uploadEcso = File.getContent('./upload-cmxs.yml').replace('::ARTIFACT_NAME::', "ecso-" + manifest.name);
+				align(uploadEcso, head);
+			} else {
+				'';
+			}
+
+			return uploadEcso + uploadHaxe;
 		});
 
 		// Download artifact