Move all builds to AppVeyor

2024-11-24 20:23:03 +00:00 · 2020-03-22 19:34:50 -07:00 · 2020-03-22 19:34:50 -07:00 · 62d76c006d
commit 62d76c006d
parent 615b78a612
4 changed files with 52 additions and 83 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -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'
--- 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
--- a/appveyor.yml
+++ 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=<app\version.txt'
+  - sh: 'export VERSION=`cat app/version.txt`'
+
+build_script:
+  - cmd: 'scripts\generate-installers.bat Debug %ARCH%'
+  - cmd: 'scripts\generate-installers.bat Release %ARCH%'
+  - sh: '[ "$BUILD_TARGET" != linux ] || qmake moonlight-qt.pro -spec linux-g++'
+  - sh: '[ "$BUILD_TARGET" != linux ] || make -j$(nproc) debug'
+  - sh: '[ "$BUILD_TARGET" != linux ] || make -j$(nproc) release'
+  - sh: '[ "$BUILD_TARGET" != macos ] || scripts/generate-dmg.sh Release'
+  - sh: '[ "$BUILD_TARGET" != steamlink ] || STEAMLINK_SDK_PATH=$HOME/steamlink-sdk scripts/build-steamlink-app.sh'
+
+after_build:
+  - cmd: 'appveyor PushArtifact build\installer-%ARCH%-Release\MoonlightSetup-%ARCH%-%VERSION%.exe -FileName MoonlightSetup-%ARCH%-r%APPVEYOR_BUILD_NUMBER%.exe'
+  - cmd: 'appveyor PushArtifact build\installer-%ARCH%-Release\MoonlightPortable-%ARCH%-%VERSION%.zip -FileName MoonlightPortable-%ARCH%-r%APPVEYOR_BUILD_NUMBER%.zip'
+  - cmd: 'appveyor PushArtifact build\symbols-%ARCH%-Release\MoonlightDebuggingSymbols-%ARCH%-%VERSION%.zip -FileName MoonlightDebuggingSymbols-%ARCH%-r%APPVEYOR_BUILD_NUMBER%.zip'
+  - sh: '[ "$BUILD_TARGET" != steamlink ] || appveyor PushArtifact build/installer-release/Moonlight-SteamLink-$VERSION.zip -FileName Moonlight-SteamLink-r$APPVEYOR_BUILD_NUMBER.zip'
+  - sh: '[ "$BUILD_TARGET" != macos ] || appveyor PushArtifact build/installer-Release/Moonlight-$VERSION.dmg -FileName Moonlight-r$APPVEYOR_BUILD_NUMBER.dmg'
+
+deploy: off
--- a/scripts/generate-installers.bat
+++ b/scripts/generate-installers.bat
@ -206,15 +206,6 @@ if !ERRORLEVEL! NEQ 0 goto Error
 7z a %INSTALLER_FOLDER%\MoonlightPortable-%ARCH%-%VERSION%.zip %DEPLOY_FOLDER%\*
 if !ERRORLEVEL! NEQ 0 goto Error

-if /i "%APPVEYOR%"=="true" (
-    echo Pushing artifacts
-    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightSetup-%ARCH%-%VERSION%.exe -FileName MoonlightSetup-%ARCH%-%BUILD_CONFIG%.exe
-    if !ERRORLEVEL! NEQ 0 goto Error
-    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightPortable-%ARCH%-%VERSION%.zip -FileName MoonlightPortable-%ARCH%-%BUILD_CONFIG%.zip
-    if !ERRORLEVEL! NEQ 0 goto Error
-    appveyor PushArtifact %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols-%ARCH%-%VERSION%.zip -FileName MoonlightDebuggingSymbols-%ARCH%-%BUILD_CONFIG%.zip
-)
-
 echo Build successful for Moonlight v%VERSION%!
 exit /b 0