Skip to content

Commit

Permalink
Use human-friendly package version numbers in AppVeyor. (ponylang#2428)
Browse files Browse the repository at this point in the history
* Use human-friendly package version numbers in AppVeyor.

Also fixes errorlevel returns in the `make.bat` build script.

* make BinTray version match the appveyor version
  • Loading branch information
chalcolith authored and jemc committed Dec 19, 2017
1 parent 3e496d0 commit e96fa95
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ build_script:
- python -x waf configure
- python -x waf build --config %configuration% --llvm %llvm%
- ps: |
$ponydir = "${env:appveyor_build_version}-win64"
$ponydir = "ponyc-${package_version}-win64"
cd C:\projects\ponyc
md "$ponydir"
md "${ponydir}\ponyc"
Expand All @@ -76,7 +76,7 @@ deploy:
subject: pony-language
repo: ponyc-win
package: ponyc
version: $(appveyor_build_version)
version: ponyc-$(package_version)
on:
branch: release
llvm: 3.9.1
Expand Down
4 changes: 3 additions & 1 deletion make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@ goto running

rem @echo Using %PYTHON%

"%PYTHON%" -x "%~dp0waf" %* & Endlocal & exit /b %ERRORLEVEL%
"%PYTHON%" -x "%~dp0waf" %*
Endlocal
%COMSPEC% /c exit /b %ERRORLEVEL%

0 comments on commit e96fa95

Please sign in to comment.