From 02a7dbac2aa75e9025ad7610cd9da77494409210 Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Sat, 19 Nov 2016 11:53:33 +0100 Subject: [PATCH] missing CI updates after rebase --- .travis.yml | 6 +++++- appveyor.yml | 14 +++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28ba850223..64c80a9059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,11 @@ before_deploy: - ls dist - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mv dist/mac/*.dmg dist/mac/safe-browser-${TRAVIS_TAG}-osx-x64.dmg; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export RELEASE_PKG=$(ls dist/mac/*.dmg); fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rename -v "s/safe-browser-\d\.\d\.\d/safe-browser-${TRAVIS_TAG}-linux-x64/" dist/safe*; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv dist/linux-unpacked dist/safe-browser-${TRAVIS_TAG}-linux-x64; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then zip -r dist/safe-browser-${TRAVIS_TAG}-linux-x64.zip dist/safe-browser-${TRAVIS_TAG}-linux-x64; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm -rf dist/safe-browser-${TRAVIS_TAG}-linux-x64; fi # remove folder to not try and deploy it + - ls + - ls dist - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export RELEASE_PKG="dist/safe*"; fi - echo "deploying ${RELEASE_PKG} to GitHub releases" deploy: diff --git a/appveyor.yml b/appveyor.yml index dbc4397402..89c79a6399 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: - npm --version - npm install npm@next -g - npm install - - npm run rebuild:only + # - npm run rebuild:only - npm run build @@ -34,9 +34,12 @@ build_script: after_build: - ps: Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - dir dist - - rename dist/win-unpacked dist/safe-browser-$(appveyor_repo_tag_name)-win - - 7z a dist/safe-browser-$(appveyor_repo_tag_name)-win - - dir dist + - echo dist\safe-browser-%APPVEYOR_REPO_TAG_NAME%-win + - cd dist + - dir + - rename win-unpacked safe-browser-%APPVEYOR_REPO_TAG_NAME%-win + - 7z a safe-browser-%APPVEYOR_REPO_TAG_NAME%-win.zip + - dir - echo %APPVEYOR_REPO_TAG% - echo %APPVEYOR_REPO_TAG_NAME% @@ -44,7 +47,8 @@ artifacts: - path: dist/*-win.zip before_deploy: - - dir dist + # - dir dist + deploy: release: $(appveyor_repo_tag_name) tag: $(appveyor_repo_tag_name)