Skip to content
Permalink
Browse files

ci: appveyor use bash deploy script

  • Loading branch information
JaCzekanski committed Jul 31, 2019
1 parent d36e907 commit 35c8286b21c6ce4573c38a453f2c2f26d412d066
Showing with 11 additions and 47 deletions.
  1. +1 −7 .appveyor.yml
  2. +0 −39 .appveyor/deploy.ps1
  3. +10 −1 .travis/deploy.sh
@@ -19,12 +19,6 @@ environment:
TOOLSET: vs2017
platform: x64

init:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

on_finish:
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

# TODO: Move to PowerShell script
before_build:
- git submodule update --init --recursive
@@ -99,4 +93,4 @@ artifacts:
name: avocado

deploy_script:
- ps: ./.appveyor/deploy.ps1 $env:DEPLOY_KEY upload/
- bash ./.travis/deploy.sh %DEPLOY_KEY% upload/

This file was deleted.

@@ -21,8 +21,17 @@ else
exit 2
fi

BRANCH=""
if [[ ! -z "${TRAVIS_BRANCH}" ]]; then
BRANCH=$TRAVIS_BRANCH
elif [[ ! -z "${APPVEYOR_REPO_BRANCH}" ]]; then
BRANCH=$APPVEYOR_REPO_BRANCH
else
echo "TRAVIS_BRANCH or APPVEYOR_REPO_BRANCH env not found"
exit 3
fi

REVISION="$(git rev-parse --short=7 HEAD)"
BRANCH=$TRAVIS_BRANCH
AUTHOR="$(git log -1 "$REVISION" --pretty="%aN")"
MESSAGE="$(git log -1 "$REVISION" --pretty="%s")"
DATE="$(git log -1 "$REVISION" --pretty="%aI")"

0 comments on commit 35c8286

Please sign in to comment.
You can’t perform that action at this time.