summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2018-10-23 05:58:42 +0200
committerAleks Kissinger <aleks0@gmail.com>2018-10-23 06:08:11 +0200
commitb0d269838f2683b1d886a99ed2e979f256515ad1 (patch)
treededbc1c44116f2849ca6d96d13cb235d80b70089
parent253df5f1d9e8915dfc62261dd338b96014dc1984 (diff)
all deploy flags on
-rw-r--r--.appveyor.yml16
-rw-r--r--.travis.yml4
2 files changed, 14 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 4675ef3..8b50ed7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,8 +1,5 @@
version: '{branch}-{build}'
-environment:
- DEPLOY: 1
-
image:
- Ubuntu1804
- Visual Studio 2015
@@ -27,4 +24,15 @@ build_script:
after_build:
- sh: ./deploy-linux.sh
- sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz
- - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz'
+ # - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz'
+ - cmd: deploy-win.bat
+ - cmd: move dist/tikzit.zip tikzit-win.zip
+ # - cmd: 'if "%DEPLOY%" == "1" curl -U tikzit-win.zip https://transfer.sh/tikzit-win.zip'
+
+artifacts:
+ - file: tikzit-win.zip
+ name: tikzit
+ - file: tikzit-linux.tar.gz
+ name: tikzit
+
+
diff --git a/.travis.yml b/.travis.yml
index 1f6853f..1e8c421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,13 @@ matrix:
env:
- FILE=tikzit-osx.dmg
- QTVER=511
- - DEPLOY_TIKZIT=0
+ - DEPLOY_TIKZIT=1
- os: osx
compiler: clang
env:
- FILE=tikzit-osx-mountain.dmg
- QTVER=56
- - DEPLOY_TIKZIT=0
+ - DEPLOY_TIKZIT=1
# - os: linux
# dist: trusty
# env: