Update workflow

mattgodbolt · mattgodbolt · commit 780c3d9c7574 · 2024-12-19T11:55:48.000Z
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,6 +13,7 @@ jobs:
           python-version: '3.10' 
       - name: Unpack existing ROMs
         run: |
+          cd public
           curl -sL https://miracle.xania.org/miracle-roms.tar.gz | tar zx
       - name: Build distribution
         run: |
@@ -26,4 +27,4 @@ jobs:
           AWS_S3_BUCKET: miracle.xania.org
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          SOURCE_DIR: "."
+          SOURCE_DIR: dist
diff --git a/.gitignore b/.gitignore
@@ -24,5 +24,5 @@ dist-ssr
 *.sw?
 
 # From original Miracle
-roms/
-roms.js
+public/roms/
+src/roms.js
diff --git a/Makefile b/Makefile
@@ -20,12 +20,13 @@
 .PHONY: all z80 clean dist
 all: z80 src/roms.js
 dist: all
+	npm run build
 
-ROMS := $(shell find roms -type f | sort)
+ROMS := $(shell find public/roms -type f | sort)
 
 src/roms.js: $(ROMS) Makefile
 	echo 'export const RomList = [' > src/roms.js
-	for rom in $(ROMS); do echo \"$$rom\", | sed 's/roms\///g' >> src/roms.js; done
+	for rom in $(ROMS); do echo \"$$rom\", | sed 's|public/roms/||g' >> src/roms.js; done
 	echo '];' >> src/roms.js
 
 z80:
diff --git a/index.html b/index.html
@@ -24,7 +24,7 @@
 <html lang="en">
 <head>
     <title>Miracle - a JavaScript Sega Master System emulator</title>
-    <link rel="stylesheet" href="miracle.css" type="text/css">
+    <link rel="stylesheet" href="/miracle.css" type="text/css">
     <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
 
