From 32e86a302c6c574623d7db7d33d59b61a27d4d9a Mon Sep 17 00:00:00 2001 From: raozhiming Date: Thu, 30 May 2019 18:15:08 +0800 Subject: [PATCH] deploy windows --- .appveyor.yml | 25 +++++++++++++++++++++++-- .travis.yml | 26 ++++++++++++++------------ 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 453f4a7f..ad4ca962 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,5 @@ -image: - - Visual Studio 2017 +image: Visual Studio 2017 platform: - x86 @@ -14,6 +13,12 @@ build_script: - cmd: nmake - cmd: nmake install - cmd: nmake dist + - cmd: set packagename=%APPVEYOR_BUILD_FOLDER%\%APPVEYOR_REPO_TAG_NAME%-windows-x64-%date:~10,4%%date:~7,2%%date:~4,2%.zip + - ps: | + if ($env:APPVEYOR_REPO_TAG -eq "true") + { + 7z a -tzip $env:packagename .\outputs\* + } for: - @@ -26,3 +31,19 @@ for: test_script: - cd outputs\bin - start /b elatests.exe --robot -c ..\etc\carrier\tests.conf && elatests.exe --cases -c ..\etc\carrier\tests.conf -r 3 + +artifacts: + - path: '*.zip' + +deploy: + provider: GitHub + artifacts: + auth_token: + secure: Ydv3jxxAP6HvexomaFRj4cXpoUomi/NfumB/eWeGW2Qt/qA7xLdq+EXeQpdpVfi+ + draft: false + prerelease: false + on: + # branch: master + platform: x64 + APPVEYOR_REPO_TAG: true + diff --git a/.travis.yml b/.travis.yml index e84a8753..4ed2bebd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,37 +23,37 @@ _android: &_android matrix: include: - os: osx - env: BUILD_ENV=darwin_x64 RUN_TEST=ON + env: BUILD_ENV=darwin_x64 RUN_TEST=ON DEPLOY=ALL # if: | # NOT tag IS present OR \ # tag =~ /^(internal-test)/ - os: osx - env: BUILD_ENV=ios_arm64 PLATFORM=iphoneos + env: BUILD_ENV=ios_arm64 PLATFORM=iphoneos DEPLOY=TEST - os: osx - env: BUILD_ENV=ios_x64 PLATFORM=iphonesimulator + env: BUILD_ENV=ios_x64 PLATFORM=iphonesimulator DEPLOY=TEST - os: osx - env: BUILD_ENV=darwin_android_arm64 ANDROID_ABI=arm64-v8a NDK=r16b NO_DEPLOY=ON + env: BUILD_ENV=darwin_android_arm64 ANDROID_ABI=arm64-v8a NDK=r16b - - env: BUILD_ENV=linux_x64 ENABLE_DOCS=ON RUN_TEST=ON + - env: BUILD_ENV=linux_x64 ENABLE_DOCS=ON RUN_TEST=ON DEPLOY=ALL sudo: true - - env: BUILD_ENV=android_armv7a ANDROID_ABI=armeabi-v7a NDK=r18b + - env: BUILD_ENV=android_armv7a ANDROID_ABI=armeabi-v7a NDK=r18b DEPLOY=TEST <<: *_android - - env: BUILD_ENV=android_arm64 ANDROID_ABI=arm64-v8a NDK=r17c + - env: BUILD_ENV=android_arm64 ANDROID_ABI=arm64-v8a NDK=r17c DEPLOY=TEST <<: *_android - - env: BUILD_ENV=android_x86 ANDROID_ABI=x86 NDK=r18b + - env: BUILD_ENV=android_x86 ANDROID_ABI=x86 NDK=r18b DEPLOY=TEST <<: *_android - - env: BUILD_ENV=android_x86_64 ANDROID_ABI=x86_64 NDK=r16b + - env: BUILD_ENV=android_x86_64 ANDROID_ABI=x86_64 NDK=r16b DEPLOY=TEST <<: *_android - sudo: true - env: BUILD_ENV=raspberrypi RASPBERRRIPI=TRUE + env: BUILD_ENV=raspberrypi RASPBERRRIPI=TRUE DEPLOY=TEST install: - cd /tmp @@ -97,12 +97,14 @@ install: fi script: + - if [[ "$TRAVIS_TAG" =~ ^release && "$DEPLOY" == "TEST" ]]; then + DEPLOY=""; + fi - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]]; then BUILD_TYPE=Release; else BUILD_TYPE=Debug; fi - - export - cd $TRAVIS_BUILD_DIR/build && mkdir ${BUILD_ENV}_${BUILD_TYPE} && cd ${BUILD_ENV}_${BUILD_TYPE} - if [[ "$ANDROID_ABI" == "" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then @@ -161,7 +163,7 @@ deploy: skip_cleanup: true on: tags: true - condition: $NO_DEPLOY = "" && $TRAVIS_TAG =~ ^internal-test + condition: $DEPLOY != "" # branches: # only: # - master