Skip to content

Commit

Permalink
trigger ci 8
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmnk Freemountainer authored and Dmnk Freemountainer committed Nov 24, 2016
1 parent 9003c37 commit 78c5e3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ script:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ../tools/deploy_mac.sh quark.app && ../tools/fixTravis.sh quark.app /usr/local/Cellar/qt5/5.7.0/lib && 7z a quark-osx-x64.7z quark.app; fi
- ls .
- pwd

before_deploy:
- git config --global user.email "builds@travis-ci.com"
- git config --global user.name "Travis CI"
- export GIT_TAG=$TRAVIS_BRANCH-$TRAVIS_COMMIT
- git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
- git push -q https://github.com/freemountain/quark --tags
deploy:
- provider: releases
api_key:
Expand Down
8 changes: 2 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
init:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
install:
- set QTDIR=C:\Qt\5.7\mingw53_32
- set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin
Expand All @@ -10,10 +8,10 @@ build_script:
- bash -lc "cd build && mv release quark && rm -rf quark/*.o quark/*.cpp && 7z a quark-windows-x86.zip quark && ls && echo $APPVEYOR_BUILD_FOLDER"
- dir
artifacts:
- path: build/release/quark-windows-x86.zip
- path: build/quark-windows-x86.zip
name: quark-windows-x86
deploy:
release: untagged-v$(appveyor_repo_commit)
release: $(appveyor_repo_commit)-$(appveyor_repo_commit)
provider: GitHub
auth_token:
secure: u5Kpbjsb3snNA8/9K8ETWWSl8lYVPZTvXX+FlGAKTXFazOqsNAxPgk1pceOyev+S
Expand All @@ -22,5 +20,3 @@ deploy:
prerelease: false
on:
branch: master
on_finish:
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

0 comments on commit 78c5e3b

Please sign in to comment.