From 62d76c006dfadca28bbdba5c1abac9ef14a2513d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 22 Mar 2020 19:34:50 -0700 Subject: [PATCH] Move all builds to AppVeyor --- .travis.yml | 72 --------------------------------- README.md | 3 +- appveyor.yml | 51 +++++++++++++++++++++++ scripts/generate-installers.bat | 9 ----- 4 files changed, 52 insertions(+), 83 deletions(-) delete mode 100644 .travis.yml create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 64d75697..00000000 --- a/.travis.yml +++ /dev/null @@ -1,72 +0,0 @@ -language: cpp - -git: - depth: 1 - -matrix: - include: - - os: osx - osx_image: xcode10.2 - compiler: clang - env: TRAVIS_TARGET=osx - addons: - homebrew: - packages: - - qt - - os: linux - sudo: required - dist: xenial - compiler: gcc - env: TRAVIS_TARGET=steamlink - addons: - apt: - packages: - - libc6:i386 - - libstdc++6:i386 - - os: linux - sudo: required - dist: bionic - compiler: gcc - env: TRAVIS_TARGET=linux - addons: - apt: - sources: - - sourceline: 'ppa:savoury1/multimedia' - - sourceline: 'ppa:savoury1/ffmpeg4' - packages: - - qt5-default - - qtbase5-dev - - qtquickcontrols2-5-dev - - libqt5svg5-dev - - libgl1-mesa-dev - - libegl1-mesa-dev - - libxkbcommon-dev - - wayland-protocols - - libopus-dev - - libva-dev - - libvdpau-dev - - libsdl2-dev - - qtdeclarative5-dev - - libssl-dev - - libsdl2-ttf-dev - - libavcodec-dev - - libavutil-dev - -install: - - '[ "$TRAVIS_TARGET" != osx ] || brew link --force qt' - - if [[ "$TRAVIS_TARGET" = "osx" ]]; then nvm use node && npm install --global create-dmg; fi - - if [[ "$TRAVIS_TARGET" = "steamlink" ]]; then git clone --depth=1 https://github.com/ValveSoftware/steamlink-sdk.git $HOME/steamlink-sdk; fi - -before_script: - - '[ "$TRAVIS_TARGET" = "steamlink" ] || qmake -v' - - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != clang++ ]] || export QMAKESPEC=linux-clang' - - '[[ "$TRAVIS_TARGET" != linux || "$CXX" != g++ ]] || export QMAKESPEC=linux-g++' - - '[ "$TRAVIS_TARGET" != osx ] || export QMAKESPEC=macx-clang' - - '[ "$TRAVIS_TARGET" != "steamlink" ] || export STEAMLINK_SDK_PATH=$HOME/steamlink-sdk' - -script: - - '[ "$TRAVIS_TARGET" != "linux" ] || qmake moonlight-qt.pro -spec $QMAKESPEC' - - '[ "$TRAVIS_TARGET" != "linux" ] || make -j$(nproc) debug' - - '[ "$TRAVIS_TARGET" != "linux" ] || make -j$(nproc) release' - - '[ "$TRAVIS_TARGET" != "osx" ] || scripts/generate-dmg.sh Release' - - '[ "$TRAVIS_TARGET" != "steamlink" ] || scripts/build-steamlink-app.sh' diff --git a/README.md b/README.md index dce7d132..e66bf880 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ Moonlight also has mobile versions for [Android](https://github.com/moonlight-st You can follow development on our [Discord server](https://moonlight-stream.org/discord). - [![Windows AppVeyor Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master) - [![Mac and Linux Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-qt.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-qt) + [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master) [![Downloads](https://img.shields.io/github/downloads/moonlight-stream/moonlight-qt/total)](https://github.com/moonlight-stream/moonlight-qt/releases) ## Features diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..2180f756 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,51 @@ +version: 0.0.0.{build} + +clone_depth: 1 + +environment: + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTDIR: C:\Qt\5.14\msvc2017_64 + ARCH: x64 + - APPVEYOR_BUILD_WORKER_IMAGE: macOS + BUILD_TARGET: macos + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTDIR: C:\Qt\5.14\msvc2017 + ARCH: x86 + - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604 + BUILD_TARGET: steamlink + - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu + BUILD_TARGET: linux + +install: + - sh: '[ "$BUILD_TARGET" != macos ] || nvm use node' + - sh: '[ "$BUILD_TARGET" != macos ] || npm install --global create-dmg' + - sh: '[ "$BUILD_TARGET" != steamlink ] || sudo apt install -y libc6:i386 libstdc++6:i386' + - sh: '[ "$BUILD_TARGET" != steamlink ] || git clone --depth=1 https://github.com/ValveSoftware/steamlink-sdk.git $HOME/steamlink-sdk' + - sh: '[ "$BUILD_TARGET" != linux ] || sudo add-apt-repository ppa:savoury1/multimedia' + - sh: '[ "$BUILD_TARGET" != linux ] || sudo add-apt-repository ppa:savoury1/ffmpeg4' + - sh: '[ "$BUILD_TARGET" != linux ] || sudo apt install -y qt5-default qtbase5-dev qtquickcontrols2-5-dev libqt5svg5-dev libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev wayland-protocols libopus-dev libva-dev libvdpau-dev libsdl2-dev qtdeclarative5-dev libssl-dev libsdl2-ttf-dev libavcodec-dev libavutil-dev' + +before_build: + - 'git submodule update --init --recursive' + - cmd: 'set PATH=%PATH%;%QTDIR%\bin;%ProgramFiles(x86)%\WiX Toolset v3.11\bin' + - cmd: 'set /p VERSION=