From 98c1c2c45524b9ee63876b07cf983c6c2910375d Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Thu, 11 Apr 2024 05:26:14 -0500 Subject: [PATCH] fix parallel release target --- .github/workflows/_artifact.yml | 2 +- Makefiles/Makefile.Win32 | 2 -- Makefiles/Rules.inc | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_artifact.yml b/.github/workflows/_artifact.yml index a712325a..b741c353 100644 --- a/.github/workflows/_artifact.yml +++ b/.github/workflows/_artifact.yml @@ -56,7 +56,7 @@ jobs: mingw64/mingw-w64-x86_64-SDL2_net - name: Compile run: | - make -f Makefiles/${{ matrix.makefile }} release NET_BOARD=1 BIN_DIR=bin OUTFILE=supermodel${{ matrix.outfile_ext }} OPT="${OPT_INPUT:-"-O3 -g"}" LDOPT="" + make -f Makefiles/${{ matrix.makefile }} -j release NET_BOARD=1 BIN_DIR=bin OUTFILE=supermodel${{ matrix.outfile_ext }} OPT="${OPT_INPUT:-"-O3 -g"}" LDOPT="" echo "pkg_path=$(make -f Makefiles/${{ matrix.makefile }} -j pkg/path)" >> $GITHUB_ENV - name: Validate run: ./bin/supermodel${{ matrix.outfile_ext }} -print-games diff --git a/Makefiles/Makefile.Win32 b/Makefiles/Makefile.Win32 index 6b10ca71..f86b6e41 100644 --- a/Makefiles/Makefile.Win32 +++ b/Makefiles/Makefile.Win32 @@ -118,8 +118,6 @@ PLATFORM_SRC_FILES = \ Src/OSD/Windows/WinOutputs.cpp \ Src/OSD/Windows/SupermodelResources.rc -.PHONY: clean - include Makefiles/Rules.inc clean: diff --git a/Makefiles/Rules.inc b/Makefiles/Rules.inc index dde9869d..b9b20b78 100644 --- a/Makefiles/Rules.inc +++ b/Makefiles/Rules.inc @@ -223,12 +223,12 @@ all: $(BIN_DIR)/$(OUTFILE) # version number. Double-colon rules should force ordered execution. # The automated build script relies on these -- don't modify their output! # +.PHONY: clean .PHONY: set_version .PHONY: print_message .PHONY: version -release:: set_version -release:: print_message release:: clean +release:: print_message release:: all PKG_FILES += $(BIN_DIR)/$(OUTFILE) Docs/README.txt Docs/LICENSE.txt Config Assets @@ -261,7 +261,7 @@ pkg/path: set_version set_version: $(eval VERSION = $(strip $(subst ',,0.3a-git-$(shell git rev-parse --short HEAD --sq)))) $(eval SUPERMODEL_BUILD_FLAGS += -DSUPERMODEL_VERSION=\"$(VERSION)\") -print_message: +print_message: set_version $(info Building Supermodel Version $(VERSION)) version: set_version @echo $(VERSION)