Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
txxia committed Oct 7, 2018
2 parents 72b9b50 + d365942 commit 39fc0eb
Show file tree
Hide file tree
Showing 29 changed files with 1,661 additions and 641 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ venv/
dist/
build/
*.ini
_*/
.coverage
_*
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Starbound Map Viewer
====================
[![Build status](https://ci.appveyor.com/api/projects/status/c9xt316vgaqfte9c/branch/master?svg=true)](https://ci.appveyor.com/project/txxia/starbound-map/branch/master)

This tool is built on top of @blixt's awesome work: [Starbound Utilities](https://github.com/blixt/py-starbound).

![MapViewer](./screenshots/MapViewer.PNG)
Expand Down
61 changes: 37 additions & 24 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,52 @@
# Do not build on tags (GitHub and BitBucket)
skip_tags: true

branches:
only:
- master
- dev

environment:
matrix:
- PYTHON: "C:\\Python35"
PYTHON_VERSION: "3.5.x"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python37"
PYTHON_VERSION: "3.7.x"
PYTHON_ARCH: "32"
init:
- "SET PATH=%PYTHON%;%PATH%"
- "SET PATH=%PYTHON%;%PATH%"

- python -V
- "%PYTHON%\\Scripts\\pip.exe install --upgrade pip"
- "%PYTHON%\\Scripts\\pip.exe install --upgrade setuptools wheel virtualenv"
- python -V
- python -m pip install --upgrade pip
- python -m pip install --upgrade setuptools wheel virtualenv

before_build:
- python -m virtualenv venv
- venv\Scripts\activate
- python -c "import sys; print(sys.executable)"
- pip install -r requirements.txt
- python -m virtualenv venv
- venv\Scripts\activate
- python -c "import sys; print(sys.executable)"
- pip install -r requirements.txt
- pip install -r requirements_dev.txt

build_script:
- pip install pyinstaller
- pyinstaller mapviewer.spec
- python -c "print('dummy build stage to disable MSBuild')"

test_script:
- python -m pytest

artifacts:
- path: 'dist\*'
- path: 'dist/*.exe'
- path: 'build/coverage/html/*'

deploy:
- provider: GitHub
release: v$(appveyor_build_version)
description: Build v$(appveyor_build_version)
auth_token:
secure: aEuceXtTw4tyxWydRznIxKqzxFIkZAFriOlmvvjYFsmP57I/0uWNWCZc2GcRylOa
artifact: dist\StarboundMapViewer.exe
draft: false
on:
branch: master
appveyor_repo_tag: false
- provider: GitHub
release: v$(appveyor_build_version)
description: Build v$(appveyor_build_version)
auth_token:
secure: aEuceXtTw4tyxWydRznIxKqzxFIkZAFriOlmvvjYFsmP57I/0uWNWCZc2GcRylOa
artifact: dist/StarboundMapViewer.exe
draft: false
on:
branch: master
appveyor_repo_tag: false

before_deploy:
- pip install pyinstaller
- pyinstaller mapviewer.spec
Loading

0 comments on commit 39fc0eb

Please sign in to comment.