Skip to content

Commit

Permalink
fix parallel release target
Browse files Browse the repository at this point in the history
  • Loading branch information
h0tw1r3 committed Apr 11, 2024
1 parent 4ba4366 commit 98c1c2c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Makefiles/Makefile.Win32
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ PLATFORM_SRC_FILES = \
Src/OSD/Windows/WinOutputs.cpp \
Src/OSD/Windows/SupermodelResources.rc

.PHONY: clean

include Makefiles/Rules.inc

clean:
Expand Down
6 changes: 3 additions & 3 deletions Makefiles/Rules.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 98c1c2c

Please sign in to comment.