diff --git a/.travis.yml b/.travis.yml index 34d691ce..6e1b56ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,6 +80,8 @@ script: # Prepare tag name - export TAG="$TRAVIS_TAG" - if [[ "$TAG" == "" ]]; then export TAG=unstable; fi + - export BRANCH="$TRAVIS_BRANCH" + - if [[ "$BRANCH" == "$TAG" ]]; then export BRANCH=master; fi # (Mac) Prepare dmg - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv dust3d.app dust3d-$TAG.app || travis_terminate 1; fi @@ -119,5 +121,5 @@ script: # Distribute - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "No distribution on pull request"; fi - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then travis_terminate 0; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$TRAVIS_BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG.dmg; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$TRAVIS_BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG-x86_64.AppImage; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG.dmg; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG-x86_64.AppImage; fi diff --git a/appveyor.yml b/appveyor.yml index 1524dfc9..cd0aaeea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,13 +68,24 @@ artifacts: name: platform_zips deploy: - release: $(TAG) - force_update: true - provider: GitHub - auth_token: - secure: Rhzhefjk89WN2tDht8vVKYAojGfR23LhDPKPxhQwbT7k3qswSWjmoFoDTpIHNfc0 - artifact: platform_zips - draft: false - prerelease: false - on: - branch: master # release from master branch only + - provider: GitHub + release: $(TAG) + force_update: true + auth_token: + secure: Rhzhefjk89WN2tDht8vVKYAojGfR23LhDPKPxhQwbT7k3qswSWjmoFoDTpIHNfc0 + artifact: platform_zips + draft: false + prerelease: false + on: + branch: master + + - provider: GitHub + release: $(TAG) + force_update: true + auth_token: + secure: Rhzhefjk89WN2tDht8vVKYAojGfR23LhDPKPxhQwbT7k3qswSWjmoFoDTpIHNfc0 + artifact: platform_zips + draft: false + prerelease: false + on: + APPVEYOR_REPO_TAG: true diff --git a/dust3d.pro b/dust3d.pro index 5efb950c..064b3633 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -4,10 +4,10 @@ DEFINES += NDEBUG RESOURCES += resources.qrc isEmpty(HUMAN_VERSION) { - HUMAN_VERSION = "1.0.0-beta.2" + HUMAN_VERSION = "1.0.0-beta.3" } isEmpty(VERSION) { - VERSION = 1.0.0.2 + VERSION = 1.0.0.3 } REPOSITORY_URL = "https://github.com/huxingyi/dust3d"