From ef816accb377a5be05c5debf096dd038eee98aa8 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 15 Sep 2024 13:33:47 -0400 Subject: [PATCH] Bump up RAM requirement and reenable broken demos These were failing because some WADs require more than a 16MiB heap. --- .github/workflows/ci.yml | 8 -------- GNUmakefile | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6edf3fb..f54bf86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,14 +30,6 @@ jobs: sudo apt-get update sudo apt-get install make chocolate-doom python3 python3-yaml - - name: Patch out broken demos - run: | - # These work in Chocolate Doom HEAD but don't seem to currently - # work in the older version in ubuntu-latest. - # TODO: Reenable these. - grep -v 30av-25337 < demos.txt | grep -v pl2all1.txt > new-demos.txt - mv new-demos.txt demos.txt - - name: Run checks run: | make check diff --git a/GNUmakefile b/GNUmakefile index 2d16f5c..07e9950 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,7 +13,7 @@ export SDL_VIDEODRIVER = dummy SOURCE_PORT_NAME = chocolate-doom SOURCE_PORT := $(shell which $(SOURCE_PORT_NAME) || echo missing_source_port) -DOOMOPTS = -mb 16 -nodraw -noblit -nosound \ +DOOMOPTS = -mb 24 -nodraw -noblit -nosound \ -noautoload -nogui -nograbmouse -nofullscreen ALL_DEMOS = $(patsubst %,demos/%,$(shell cat demos.txt))