Merge branch 'master' into unit-tests

This commit is contained in:
Piotr Pekala
2019-03-08 00:07:18 -08:00
3 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ build_script:
- "%PYTHON%\\python.exe scripts\\build.py build_exe -b dist/exe.gns3server -s" - "%PYTHON%\\python.exe scripts\\build.py build_exe -b dist/exe.gns3server -s"
- "%PYTHON%\\python.exe scripts\\build.py validate -b dist" - "%PYTHON%\\python.exe scripts\\build.py validate -b dist"
- "%PYTHON%\\python.exe scripts\\build.py download_dependencies -b dist" - "%PYTHON%\\python.exe scripts\\build.py download_dependencies -b dist"
- yarn electron-builder --win --x64 - yarn electron-builder --win --x64 --publish always
test: off test: off

View File

@ -54,7 +54,7 @@ jobs:
- run: - run:
name: Dist project name: Dist project
command: | command: |
yarn electron-builder --mac --x64 yarn electron-builder --mac --x64 --publish always
- run: - run:
name: Gather artifacts name: Gather artifacts

View File

@ -68,4 +68,4 @@ after_script:
python3 scripts/build.py download python3 scripts/build.py download
python3 scripts/build.py build_exe -b dist/exe.gns3server -s python3 scripts/build.py build_exe -b dist/exe.gns3server -s
python3 scripts/build.py validate -b dist python3 scripts/build.py validate -b dist
- yarn electron-builder --linux --x64 - yarn electron-builder --linux --x64 --publish always