Fix fpga-releaser to work with new matrix build paths and archives

Author: nathanaelhuffman

.github/workflows/build.yml

@@ -195,7 +195,7 @@ jobs:
           echo "Build output: $OUTPUT"
           echo "Output directory: $OUTPUT_DIR"
           echo "output_dir=$OUTPUT_DIR" >> "$GITHUB_OUTPUT"
-          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||')
+          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||' | tr '_' '-')
           echo "artifact_name=${TARGET_NAME}-image" >> "$GITHUB_OUTPUT"
 
       - name: Upload artifact
@@ -246,7 +246,7 @@ jobs:
           echo "Build output: $OUTPUT"
           echo "Output directory: $OUTPUT_DIR"
           echo "output_dir=$OUTPUT_DIR" >> "$GITHUB_OUTPUT"
-          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||')
+          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||' | tr '_' '-')
           echo "artifact_name=${TARGET_NAME}-image" >> "$GITHUB_OUTPUT"
 
       - name: Upload artifact
@@ -297,7 +297,7 @@ jobs:
           echo "Build output: $OUTPUT"
           echo "Output directory: $OUTPUT_DIR"
           echo "output_dir=$OUTPUT_DIR" >> "$GITHUB_OUTPUT"
-          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||')
+          TARGET_NAME=$(echo "${{ matrix.target }}" | sed 's|.*:||' | tr '_' '-')
           echo "artifact_name=${TARGET_NAME}-image" >> "$GITHUB_OUTPUT"
 
       - name: Upload artifact

tools/fpga_releaser/archive_parser.py

@@ -15,7 +15,7 @@ def get_relevant_files_from_buck_zip(fpga_name, zip):
             continue
         if item.filename.endswith(".bz2"):
             zip_names.append(item.filename)
-        if "/maps/" in item.filename and (item.filename.endswith(".json") or item.filename.endswith(".html")):
+        if "maps/" in item.filename and (item.filename.endswith(".json") or item.filename.endswith(".html")):
             zip_names.append(item.filename)
         if item.filename.endswith("nextpnr.log"):
            zip_names.append(item.filename)