ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Actually fix Zip file name 

Get the correct version string from SetGitProperties.cmd
This commit is contained in:
oddMLan 2019-10-02 21:57:18 -07:00
parent 56330dce8c
commit 25fe58bfb9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Script/SetGitProperties.cmd
View File

@ -12,6 +12,7 @@ for /F "tokens=1,2,3 delims=-" %%i in ("%GIT_DESCRIBE%") do call :process_git_de
for /F "tokens=1,2,3" %%i in (%base_dir%\Source\Project64-core\version.h.in) do call :process_version %%i %%j %%k for /F "tokens=1,2,3" %%i in (%base_dir%\Source\Project64-core\version.h.in) do call :process_version %%i %%j %%k
set VERSION=v%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%-%VERSION_BUILD%-%VERSION_COMMIT% set VERSION=v%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_REVISION%-%VERSION_BUILD%-%VERSION_COMMIT%
echo %VERSION%
echo GIT_DESCRIBE = %VERSION% > "%base_dir%\git.properties" echo GIT_DESCRIBE = %VERSION% > "%base_dir%\git.properties"
goto :EOF goto :EOF

10
appveyor.yml
View File

@ -9,17 +9,15 @@ configuration:
before_build: before_build:
- ps: >- - ps: >-
If ($env:APPVEYOR_BUILD_VERSION -Like "1.0*") { If ($env:APPVEYOR_BUILD_VERSION -Like "1.0*") {
echo $env:APPVEYOR_BUILD_VERSION $version = Source/Script/SetGitProperties.cmd
$current_tag = git describe --tags --long --dirty appveyor UpdateBuild -Version $version
echo $current_tag
appveyor UpdateBuild -Version $current_tag
} }
build: build:
project: Project64.sln project: Project64.sln
parallel: true parallel: true
verbosity: minimal verbosity: minimal
after_build: after_build:
- Source/Script/package_zip.cmd %current_tag%-%platform%.zip %platform% - Source/Script/package_zip.cmd %APPVEYOR_BUILD_VERSION%-%platform%.zip %platform%
artifacts: artifacts:
- path: Package/*.zip - path: Package/*.zip