From 7b1fa25d8f80a7bb7f0195525d54db4812b90a77 Mon Sep 17 00:00:00 2001 From: TheGoddessInari Date: Sun, 3 Mar 2019 16:58:54 -0800 Subject: [PATCH] Change appveyor.yml to be Windows-only. Remove .travis.yml. Azure DevOps currently doesn't support any way of having Ruby on Windows, so we still have to keep AppVeyor around for now. --- .travis.yml | 127 --------------------------------------------------- appveyor.yml | 41 ++++------------- 2 files changed, 9 insertions(+), 159 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index aad95c38..00000000 --- a/.travis.yml +++ /dev/null @@ -1,127 +0,0 @@ -sudo: required -language: node_js -dist: trusty -node_js: - - "8" - -branches: - only: - - master - - testing - except: - - snapshot-master - - snapshot-testing - -os: - - osx - -osx_image: xcode9.3 - -cache: - directories: - - node_modules - - $HOME/.electron - -env: - global: - - SENCHA_VER=6.6.0.13 - - secure: "sEoA+xvrsfYuxGOlrcdHudu0nYjlV47wwyMMgurSi+Em4izYgXoe5JLYDZ5nniO2iDAmD1IqjwbxhBrbRyue2b0gyyuz4PbPfsR5sSbegZ3xum8nzn7Jg5NydllLQbJmPKSsOGOhiOYdprUvMsbmvTWVOwSAs6fH/PorJlqegODpsa8GeuNTXPsI5pT2j98F+DJaF+wAKdkhpgpX3ggdCCdY4pb7SdLk+2Q51IPZhgEPG1AXv2kfXFXHQIwZp76+5hva0aKZEjXipgkPeOr/tLgsIdrSCHAPigxcZyb8SvJzNMIniHfNmdzWr8q2tJuh2W9zCuYhghJQ4pkGUc3OFR0xaLU9aP17u9P/7AB+Zv/PaO5ta5Ay49/2K38hrfAjgBioUCrICH4jXTZenmg8X6q5ksx6R3wBMLP0qv1wyvGEakzIhqBjTwBnZyGE7aLpyGyi4qP0TcBQ7APVaAa1HYsd8uz4GTm67SCqEELzGJlt14dkep9FLIPBFVMo1kzHK45ltLPSawUsJ4Z5Ds8nAdJi1ZEik2IWh6++XVn65fGe0qOdZ1T0AvOgln7RVv4WtznEBcjK0vwP68++XQditB6oGRnMitnVyudQfoSI6j5q0KPrTDRENRN+yh0ofqO/YhkNu1BxCzLLoHQ4Rb5DdX8kALNWupqbCnw1Ce4KJw0=" - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - - rpm - -install: - - git config --global core.autocrlf input - - git reset --hard HEAD - - npm install - - npm uninstall electron-prebuilt - - npm i electron@${ELECTRON} - - if [ $TRAVIS_OS_NAME == "linux" ]; then - curl -o SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip http://cdn.sencha.com/cmd/${SENCHA_VER}/no-jre/SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip; - unzip SenchaCmd-${SENCHA_VER}-linux-amd64.sh.zip; - chmod +x SenchaCmd-${SENCHA_VER}-linux-amd64.sh; - ./SenchaCmd-${SENCHA_VER}-linux-amd64.sh -q -Dall=true; - else - curl -o SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip http://cdn.sencha.com/cmd/${SENCHA_VER}/no-jre/SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip; - unzip SenchaCmd-${SENCHA_VER}-osx-no_jre.app.zip; - SenchaCmd-${SENCHA_VER}-osx-no_jre.app/Contents/MacOS/JavaApplicationStub -q -Dall=true; - fi -before_script: - - export PATH=~/bin/Sencha/Cmd/${SENCHA_VER}:${PATH} - - export CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} - -script: - - echo ${TRAVIS_OS_NAME} - - node --version - - npm --version - - sencha audit - - npm run setup:${TRAVIS_OS_NAME} - -# after_success: - # - git config --global user.email "travis@travis-ci.org" - # - git config --global user.name "Travis" - # - if [ ${CURRENT_BRANCH} == "testing" ]; then - # export TRAVIS_TAG="snapshot-testing"; - # git tag -f ${TRAVIS_TAG} -a -m "Automatic snapshot for testing [skip ci]"; - # (git push -q https://${TAGPERM}@github.com/TheGoddessInari/rambox --tags -f) > /dev/null 2>&1; - # elif [ ${CURRENT_BRANCH} == "master" ]; then - # export TRAVIS_TAG="snapshot-master"; - # git tag -f ${TRAVIS_TAG} -a -m "Automatic snapshot for master [skip ci]"; - # (git push -q https://${TAGPERM}@github.com/TheGoddessInari/rambox --tags -f) > /dev/null 2>&1; - # fi - -# deploy: -# - provider: releases # Snapshot tags -# on: -# repo: TheGoddessInari/rambox -# all_branches: true -# condition: ${TRAVIS_TAG} == snapshot-master || ${TRAVIS_TAG} == snapshot-testing -# api_key: -# secure: bYto8VS+zEFqKRjgBga69DgbjVPtHi4vRM+EGsNURe1b4ILRlwS8lJb5RbM+8w2UEPr8P9l959dC1pKYKjlJqEHwvDdTLFsDESO5uEUOtoEWUOnsNEwvvoNY1tFfPoFr1qhWjPWh4UGZzf/sfgXvSdoEg8cbmgbjkbEgGpKPri6Gigvosu/HT1ZCXVoud32uJ2ydfoWMfERXeQYk8u9x52Qx3XS7OMmUR1BvqifaSMt6K5oPFS1lOAXkxyCu1Sczg119+6MEWixImFcXYmPaAoHqLfPNICnhG3egiddq24f1ZGsGmfHgpliM4MNl74t99kPX6lcoQchTlhz4lVVI0lpHBymZwhIf4JjLSuZt81zW5cvJmu0CT22o/thnRFTY1MkaBDmdweaPtdYiMmAJuhwSQEeP6Mt4lqQNgtsNsBqkT6+n4T2l5RHagc/iC4TC58/4QZErKcVkaZnjy78trrQCKD9E1wLpm5hV84fF0FJLrEIhNYcSAJ6u1OJa2CaJ3u5OXFIuu01E+6CWu64pXgpIjkCRQU/JPSQVxdmwWqx4o4948NddBEx7Z3EsPkKU+5ccQr6dz7qESa8xnuERILclWO/LvdauYLhxtMVD2/fc/aKeP+6QxvNBClZT/eeO7bJDdCx/uWzm3Qo4k5+nyTl9bPUKLDzb5MuMh2x7flc= -# file_glob: true -# file: -# - "dist/*.deb" -# - "dist/*.tar.gz" -# - "dist/*.AppImage" -# - "dist/*.rpm" -# - "dist/*.zip" -# - "dist/*.dmg" -# skip_cleanup: true -# overwrite: true -# draft: false -# prerelease: true -# tag_name: $TRAVIS_TAG -# - provider: releases # Regular tags -# on: -# repo: TheGoddessInari/rambox -# all_branches: true -# condition: x${TRAVIS_TAG} != "x" && ${TRAVIS_TAG} != snapshot-master && ${TRAVIS_TAG} != snapshot-testing -# api_key: -# secure: bYto8VS+zEFqKRjgBga69DgbjVPtHi4vRM+EGsNURe1b4ILRlwS8lJb5RbM+8w2UEPr8P9l959dC1pKYKjlJqEHwvDdTLFsDESO5uEUOtoEWUOnsNEwvvoNY1tFfPoFr1qhWjPWh4UGZzf/sfgXvSdoEg8cbmgbjkbEgGpKPri6Gigvosu/HT1ZCXVoud32uJ2ydfoWMfERXeQYk8u9x52Qx3XS7OMmUR1BvqifaSMt6K5oPFS1lOAXkxyCu1Sczg119+6MEWixImFcXYmPaAoHqLfPNICnhG3egiddq24f1ZGsGmfHgpliM4MNl74t99kPX6lcoQchTlhz4lVVI0lpHBymZwhIf4JjLSuZt81zW5cvJmu0CT22o/thnRFTY1MkaBDmdweaPtdYiMmAJuhwSQEeP6Mt4lqQNgtsNsBqkT6+n4T2l5RHagc/iC4TC58/4QZErKcVkaZnjy78trrQCKD9E1wLpm5hV84fF0FJLrEIhNYcSAJ6u1OJa2CaJ3u5OXFIuu01E+6CWu64pXgpIjkCRQU/JPSQVxdmwWqx4o4948NddBEx7Z3EsPkKU+5ccQr6dz7qESa8xnuERILclWO/LvdauYLhxtMVD2/fc/aKeP+6QxvNBClZT/eeO7bJDdCx/uWzm3Qo4k5+nyTl9bPUKLDzb5MuMh2x7flc= -# file_glob: true -# file: -# - "dist/*.deb" -# - "dist/*.tar.gz" -# - "dist/*.AppImage" -# - "dist/*.rpm" -# - "dist/*.zip" -# - "dist/*.dmg" -# skip_cleanup: true -# overwrite: false -# draft: true -# prerelease: false -# tag_name: $TRAVIS_TAG - - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/a6584eccd211f35ecab6 - on_success: always # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: never # options: [always|never|change] default: always diff --git a/appveyor.yml b/appveyor.yml index c352f31e..96f5b46b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,11 @@ version: 0.5.18-{build} image: - Visual Studio 2017 - - Ubuntu environment: nodejs_version: '10' JAVA_HOME: C:\Program Files\Java\jdk1.8.0 npm_config_loglevel: 'error' - SENCHA_VER: '6.6.0.13' + SENCHA_VER: '6.7.0.37' TAGPERM: secure: FKiBHTmmImO3M5FhK2TMrnpojiT6ITuJ/LvrdLjj2xD0VkcYtXuvQr5nqoxouvph stack: node 10, jdk 8 @@ -25,23 +24,15 @@ init: install: - ps: >- - If ($isWindows) { - Install-Product node ${env:nodejs_version} - Invoke-WebRequest -Uri http://cdn.sencha.com/cmd/${env:SENCHA_VER}/no-jre/SenchaCmd-${env:SENCHA_VER}-windows-no_jre.zip -OutFile .\Sencha.zip - } ElseIf ($isLinux) { - Invoke-WebRequest -Uri http://cdn.sencha.com/cmd/${env:SENCHA_VER}/no-jre/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh.zip -OutFile .\Sencha.zip - } + Install-Product node ${env:nodejs_version} + + Invoke-WebRequest -Uri http://cdn.sencha.com/cmd/${env:SENCHA_VER}/no-jre/SenchaCmd-${env:SENCHA_VER}-windows-no_jre.zip -OutFile .\Sencha.zip Expand-Archive -Path .\Sencha.zip -DestinationPath .\SenchaCmd - If ($isWindows) { - Invoke-Expression ".\SenchaCmd\SenchaCmd-${env:SENCHA_VER}-windows-no_jre.exe -q -Dall=true" - $env:PATH = "${env:USERPROFILE}\bin\Sencha\Cmd;${env:PATH}" - } ElseIf ($isLinux) { - Invoke-Expression "chmod +x ./SenchaCmd/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh" - Invoke-Expression "./SenchaCmd/SenchaCmd-${env:SENCHA_VER}-linux-amd64.sh -q -Dall=true" - $env:PATH = "${env:HOME}/bin/Sencha/Cmd:${env:PATH}" - } + Invoke-Expression ".\SenchaCmd\SenchaCmd-${env:SENCHA_VER}-windows-no_jre.exe -q -Dall=true" + + $env:PATH = "${env:USERPROFILE}\bin\Sencha\Cmd;${env:PATH}" git reset --hard HEAD @@ -49,12 +40,6 @@ install: npm install - - sh: >- - - sudo apt-get update -qq; - - sudo apt-get install -qq -y libxml2-dev libappindicator1 rpm; - cache: - '%APPDATA%\npm-cache' - '%USERPROFILE%\.electron' @@ -74,22 +59,14 @@ build_script: npm --version - If ($isWindows) { - npm run setup:win64 - } ElseIf ($isLinux) { - npm run setup:linux64 - } + npm run setup:win64 test: off artifacts: - path: dist\*.exe - - path: dist/*.rpm - - path: dist/*.deb - - path: dist/*.tar.gz - - path: dist/*.AppImage - - path: dist/*.snap + # after_build: # - ps: >-