foo

ejona86 · Nov 23, 2023 · 2f84b11 · 2f84b11
1 parent 1a35f44
commit 2f84b11
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -4,6 +4,9 @@ on:
   push:
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,12 +16,15 @@ jobs:
     - name: Add packages
       run: |
         sudo apt-get update
-        sudo apt-get install fceux cc65 flips
+        sudo apt-get install cc65 fceux
 
     - name: Grab Dependencies
       env:
         ERSOFT_SECRET: ${{ secrets.ERSOFT_SECRET }}
       run: |
+        mkdir -p ~/.local/bin
+        curl -L -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/flips -o ~/.local/bin/flips
+        chmod +x ~/.local/bin/flips
         curl -OL -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/tetris.nes
         curl -OL -u "$ERSOFT_SECRET" https://ejona.ersoft.org/taus-ci/tetris-pal.nes
 
@@ -33,15 +39,11 @@ jobs:
         mv build/ build-pal/
 
     - name: Test NTSC
-      uses: coactions/setup-xvfb@v1
-      with:
-        run: |
-          ln -snf build-ntsc/ build
-          make V=1 test
+      run: |
+        ln -snf build-ntsc/ build
+        xvfb-run -a make V=1 test
 
     - name: Test PAL
-      uses: coactions/setup-xvfb@v1
-      with:
-        run: |
-          ln -snf build-pal/ build
-          make V=1 PAL=1 test
+      run: |
+        ln -snf build-pal/ build
+        xvfb-run -a make V=1 PAL=1 test
diff --git a/Makefile b/Makefile
@@ -231,13 +231,13 @@ FCEUXFLAGS = --pal 0
 endif
 build/%.test: %.lua
 	# Second prerequisite is assumed to be a .nes to run
-	fceux --no-config 1 --fullscreen 0 --sound 0 --frameskip 100 $(FCEUXFLAGS) --loadlua $< $(word 2,$^)
+	fceux --no-config 1 --fullscreen 0 --sound 0 --frameskip 100 $(FCEUXFLAGS) --loadlua $$(readlink -f $<) $(word 2,$^)
 	touch $@
 
 .PHONY: test
 test:
 	# fceux saves some of the configuration, so restore what we can
-	fceux --no-config 1 --sound 1 --frameskip 0 --loadlua testing-reset.lua build/tetris.nes
+	fceux --no-config 1 --sound 1 --frameskip 0 --loadlua $$(readlink -f testing-reset.lua) build/tetris.nes
 
 # include last because it enables SECONDEXPANSION
 include nes.mk