Make upload possible for all branches.
This commit is contained in:
parent
aa96d6d5dd
commit
f7a27f8cf2
2 changed files with 3 additions and 3 deletions
|
@ -16,7 +16,7 @@ REM along with Webcamoid. If not, see <http://www.gnu.org/licenses/>.
|
||||||
REM
|
REM
|
||||||
REM Web-Site: http://webcamoid.github.io/
|
REM Web-Site: http://webcamoid.github.io/
|
||||||
|
|
||||||
if not "%DAILY_BUILD%" == "" if "%APPVEYOR_REPO_BRANCH%" == "master" (
|
if not "%DAILY_BUILD%" == "" (
|
||||||
jfrog bt config ^
|
jfrog bt config ^
|
||||||
--user=hipersayanx ^
|
--user=hipersayanx ^
|
||||||
--key=%BT_KEY% ^
|
--key=%BT_KEY% ^
|
||||||
|
|
|
@ -24,7 +24,7 @@ else
|
||||||
export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -"
|
export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ( ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ) && "$TRAVIS_BRANCH" == "master" ]]; then
|
if [[ ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ]]; then
|
||||||
if [ -z "$DAILY_BUILD" ]; then
|
if [ -z "$DAILY_BUILD" ]; then
|
||||||
VER_MAJ=$(grep -re '^VER_MAJ[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
|
VER_MAJ=$(grep -re '^VER_MAJ[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
|
||||||
VER_MIN=$(grep -re '^VER_MIN[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
|
VER_MIN=$(grep -re '^VER_MIN[[:space:]]*=[[:space:]]*' commons.pri | awk '{print $3}')
|
||||||
|
@ -64,7 +64,7 @@ if [[ ( ! -z "$DAILY_BUILD" || ! -z "$RELEASE_BUILD" ) && "$TRAVIS_BRANCH" == "m
|
||||||
# Upload to Github Releases
|
# Upload to Github Releases
|
||||||
upload=false
|
upload=false
|
||||||
|
|
||||||
if [[ ! -z "$DAILY_BUILD" && "$TRAVIS_BRANCH" == master && "$upload" == true ]]; then
|
if [[ ! -z "$DAILY_BUILD" && "$upload" == true ]]; then
|
||||||
hub=''
|
hub=''
|
||||||
|
|
||||||
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
|
|
Loading…
Reference in a new issue