Skip to content

Commit 7f608d1

Browse files
committed
setting version to load assets after gpp1
1 parent d63b65b commit 7f608d1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/build-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
container: debian:oldstable-slim
1717
env:
1818
release_name: release-linux-x86_64
19+
VERSION: ${{ contains(github.ref_name, 'v1.3.0') && github.ref_name || 'v1.3.0-' ${GITHUB_SHA:0:8} }}
1920

2021
steps:
2122
- name: dependencies

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ else
107107
endif
108108
export CROSS_COMPILING
109109

110+
# Always name the version to be alphabetically *after* gpp1
110111
ifndef VERSION
111-
VERSION=1.3.0
112+
VERSION=v1.3.0
112113
endif
113114

114115
ifndef CLIENTBIN
@@ -594,7 +595,7 @@ ifdef MINGW
594595

595596
# In the absence of wspiapi.h, require Windows XP or later
596597
ifeq ($(shell test -e $(CMDIR)/wspiapi.h; echo $$?),1)
597-
# FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
598+
# FIXIT-L Update WINVER=_WIN32_WINNT_WIN7 (see https://msdn.microsoft.com/en-us/library/6sehtctf.aspx)
598599
BASE_CFLAGS += -DWINVER=0x501
599600
endif
600601

0 commit comments

Comments
 (0)