Release 1.0.0-beta.3
parent
7a244c2a16
commit
25b68d2a71
|
@ -80,6 +80,8 @@ script:
|
||||||
# Prepare tag name
|
# Prepare tag name
|
||||||
- export TAG="$TRAVIS_TAG"
|
- export TAG="$TRAVIS_TAG"
|
||||||
- if [[ "$TAG" == "" ]]; then export TAG=unstable; fi
|
- if [[ "$TAG" == "" ]]; then export TAG=unstable; fi
|
||||||
|
- export BRANCH="$TRAVIS_BRANCH"
|
||||||
|
- if [[ "$BRANCH" == "$TAG" ]]; then export BRANCH=master; fi
|
||||||
|
|
||||||
# (Mac) Prepare dmg
|
# (Mac) Prepare dmg
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv dust3d.app dust3d-$TAG.app || travis_terminate 1; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv dust3d.app dust3d-$TAG.app || travis_terminate 1; fi
|
||||||
|
@ -119,5 +121,5 @@ script:
|
||||||
# Distribute
|
# Distribute
|
||||||
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "No distribution on pull request"; fi
|
- 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_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" == "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=$TRAVIS_BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG-x86_64.AppImage; 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
|
||||||
|
|
31
appveyor.yml
31
appveyor.yml
|
@ -68,13 +68,24 @@ artifacts:
|
||||||
name: platform_zips
|
name: platform_zips
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
release: $(TAG)
|
- provider: GitHub
|
||||||
force_update: true
|
release: $(TAG)
|
||||||
provider: GitHub
|
force_update: true
|
||||||
auth_token:
|
auth_token:
|
||||||
secure: Rhzhefjk89WN2tDht8vVKYAojGfR23LhDPKPxhQwbT7k3qswSWjmoFoDTpIHNfc0
|
secure: Rhzhefjk89WN2tDht8vVKYAojGfR23LhDPKPxhQwbT7k3qswSWjmoFoDTpIHNfc0
|
||||||
artifact: platform_zips
|
artifact: platform_zips
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
on:
|
on:
|
||||||
branch: master # release from master branch only
|
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
|
||||||
|
|
|
@ -4,10 +4,10 @@ DEFINES += NDEBUG
|
||||||
RESOURCES += resources.qrc
|
RESOURCES += resources.qrc
|
||||||
|
|
||||||
isEmpty(HUMAN_VERSION) {
|
isEmpty(HUMAN_VERSION) {
|
||||||
HUMAN_VERSION = "1.0.0-beta.2"
|
HUMAN_VERSION = "1.0.0-beta.3"
|
||||||
}
|
}
|
||||||
isEmpty(VERSION) {
|
isEmpty(VERSION) {
|
||||||
VERSION = 1.0.0.2
|
VERSION = 1.0.0.3
|
||||||
}
|
}
|
||||||
|
|
||||||
REPOSITORY_URL = "https://github.com/huxingyi/dust3d"
|
REPOSITORY_URL = "https://github.com/huxingyi/dust3d"
|
||||||
|
|
Loading…
Reference in New Issue