Better github workflows

theNestruo · theNestruo · commit 13661bf2eaa0 · 2025-12-14T16:32:08.000+01:00
diff --git a/.github/workflows/on-main-push-ci-nightly.yml b/.github/workflows/on-main-push-ci-nightly.yml
@@ -1,4 +1,4 @@
-name: ci and upload nightly on branches
+name: CI and nightly build
 
 permissions:
   contents: read
@@ -7,8 +7,7 @@ permissions:
 on:
   push:
     branches:
-    - master
-    - preview
+    - main
 
 jobs:
   build-windows:
@@ -20,7 +19,7 @@ jobs:
       uses: actions/checkout@v6
 
     - name: make (Windows)
-      run: make -f makefile.win compile test
+      run: make -f windows.makefile compile test
 
     - name: Upload nightly build
       uses: actions/upload-artifact@v6
@@ -37,7 +36,7 @@ jobs:
       uses: actions/checkout@v6
 
     - name: make (Linux)
-      run: make -f makefile.linux compile test
+      run: make -f linux.makefile compile test
 
     - name: Upload nightly build
       uses: actions/upload-artifact@v6
@@ -54,7 +53,7 @@ jobs:
       uses: actions/checkout@v6
 
     - name: make (MacOS)
-      run: make -f makefile.macos compile test
+      run: make -f macos.makefile compile test
 
     - name: Upload nightly build
       uses: actions/upload-artifact@v6
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
 	"files.associations": {
-		"makefile.*": "makefile"
+		"*.makefile": "makefile"
 	},
 	//
 	"editor.insertSpaces": false,
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,11 +6,12 @@
 		{
 			"label": "make",
 			"type": "shell",
-			"command": "mingw32-make -f makefile.win",
+			"command": "mingw32-make -f windows.makefile",
 			"group": {
 				"kind": "build",
 				"isDefault": true
 			},
+			"problemMatcher": "$gcc",
 			"presentation": {
 				"echo": true,
 				"reveal": "silent",
@@ -21,4 +22,4 @@
 			}
 		}
 	]
-}
+}
diff --git a/linux.makefile b/linux.makefile
@@ -19,4 +19,4 @@ REMOVE=rm
 # main makefile
 #
 
-include makefile.common
+include shared.makefile
diff --git a/macos.makefile b/macos.makefile
@@ -19,4 +19,4 @@ REMOVE=rm
 # main makefile
 #
 
-include makefile.common
+include shared.makefile
diff --git a/readme.MD b/readme.MD
@@ -342,13 +342,13 @@ As the MSX palette is not well defined, with several emulators using slightly di
 </tr>
 </table>
 
-<sup>1</sup> TI TMS9918 palette, according Wikipedia (https://en.wikipedia.org/wiki/Texas_Instruments_TMS9918#Colors)
+<sup>1</sup> TI TMS9918 palette, according Wikipedia [wikipedia.org/wiki/Texas_Instruments_TMS9918#Colors](https://en.wikipedia.org/wiki/Texas_Instruments_TMS9918#Colors)
 
 <sup>2</sup> TI TMS9219 and V9938 palettes from hap's meisei emulator
 
-<sup>3</sup> Palette used by pixel artist <a href="https://twitter.com/Yazioh">@Yazioh</a>, because of reasons
+<sup>3</sup> Palette used by pixel artist [@Yazioh](https://twitter.com/Yazioh), because of reasons
 
-<sup>4</sup> TOSHIBA palette from reidrac's MSX Pixel Tools (https://github.com/reidrac/msx-pixel-tools)
+<sup>4</sup> TOSHIBA palette from reidrac's MSX Pixel Tools [github.com/reidrac/msx-pixel-tools](https://github.com/reidrac/msx-pixel-tools)
 
 Transparent pixels are indexed from the following values:
 
diff --git a/shared.makefile b/shared.makefile
@@ -104,16 +104,16 @@ $(TMX2BIN): src/tmx2bin.c $(COMMON_DEPS_C) $(COMMON_DEPS_TMX_C) $(COMMON_DEPS_H)
 # test targets
 #
 
-test/charset.pcx.chr test/charset.pcx.clr: $(PCX2MSX) test/charset.pcx
+test/charset.pcx.chr test/charset.pcx.clr &: $(PCX2MSX) test/charset.pcx
 	$(PCX2MSX) -v test/charset.pcx
 
-test/charset.png.chr test/charset.png.clr: $(PNG2MSX) test/charset.png
+test/charset.png.chr test/charset.png.clr &: $(PNG2MSX) test/charset.png
 	$(PNG2MSX) -v test/charset.png
 
-test/bigsprites.pcx.spat.asm test/bigsprites.pcx.spr.asm: $(PCX2SPRPLUS) test/bigsprites.pcx
+test/bigsprites.pcx.spat.asm test/bigsprites.pcx.spr.asm &: $(PCX2SPRPLUS) test/bigsprites.pcx
 	$(PCX2SPRPLUS) -v -vv -w24 -h32 test/bigsprites.pcx
 
-test/bigsprites.png.spat.asm test/bigsprites.png.spr.asm: $(PNG2SPRPLUS) test/bigsprites.png
+test/bigsprites.png.spat.asm test/bigsprites.png.spr.asm &: $(PNG2SPRPLUS) test/bigsprites.png
 	$(PNG2SPRPLUS) -v -vv -w24 -h32 test/bigsprites.png
 
 test/screen.tmx.bin: $(TMX2BIN) test/screen.tmx
@@ -122,7 +122,7 @@ test/screen.tmx.bin: $(TMX2BIN) test/screen.tmx
 test/metatiles.tmx.bin: $(TMX2BIN) test/metatiles.tmx
 	$(TMX2BIN) -v -t2 test/metatiles.tmx
 
-test/test-pal.png.chr test/test-pal.png.clr: $(PNG2MSX) test/test-pal.png
+test/test-pal.png.chr test/test-pal.png.clr &: $(PNG2MSX) test/test-pal.png
 	$(PNG2MSX) -v test/test-pal.png
 
 demopcx: $(PCX2SPRPLUS) pcx2sprplus_demo/demo.pcx pcx2sprplus_demo/demo.asm
diff --git a/windows.makefile b/windows.makefile
@@ -20,4 +20,4 @@ REMOVE=cmd /c del
 # main makefile
 #
 
-include makefile.common
+include shared.makefile

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"files.associations": {`
`3`		`- "makefile.*": "makefile"`
	`3`	`+ "*.makefile": "makefile"`
`4`	`4`	`},`
`5`	`5`	`//`
`6`	`6`	`"editor.insertSpaces": false,`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,12 @@`
`6`	`6`	`{`
`7`	`7`	`"label": "make",`
`8`	`8`	`"type": "shell",`
`9`		`- "command": "mingw32-make -f makefile.win",`
	`9`	`+ "command": "mingw32-make -f windows.makefile",`
`10`	`10`	`"group": {`
`11`	`11`	`"kind": "build",`
`12`	`12`	`"isDefault": true`
`13`	`13`	`},`
	`14`	`+ "problemMatcher": "$gcc",`
`14`	`15`	`"presentation": {`
`15`	`16`	`"echo": true,`
`16`	`17`	`"reveal": "silent",`
`@@ -21,4 +22,4 @@`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`]`
`24`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ REMOVE=rm`
`19`	`19`	`# main makefile`
`20`	`20`	`#`
`21`	`21`
`22`		`-include makefile.common`
	`22`	`+include shared.makefile`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ REMOVE=cmd /c del`
`20`	`20`	`# main makefile`
`21`	`21`	`#`
`22`	`22`
`23`		`-include makefile.common`
	`23`	`+include shared.makefile`