From 132a04d9b9b9cd7d9df2fe2aaff8dcfe7ebfdf58 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Sun, 29 Oct 2017 12:13:04 +1100 Subject: [PATCH] Use MSBuild and appveyor.yml (#2031) --- .github/appveyor.yml => appveyor.yml | 59 +++++++++------------------- 1 file changed, 19 insertions(+), 40 deletions(-) rename .github/appveyor.yml => appveyor.yml (51%) diff --git a/.github/appveyor.yml b/appveyor.yml similarity index 51% rename from .github/appveyor.yml rename to appveyor.yml index 33704838c..c11497e88 100644 --- a/.github/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,10 @@ -version: 0.7.{build} +version: 0.8.{build} +pull_requests: + do_not_increment_build_number: true skip_tags: true -image: Visual Studio 2015 +image: Visual Studio 2017 configuration: Release +shallow_clone: true assembly_info: patch: true file: '**\AssemblyInfo.*' @@ -16,43 +19,24 @@ build: verbosity: minimal after_build: - cmd: >- - xcopy src\Jackett.Console\bin\Release build.windows\ /e /y + xcopy src\Jackett.Console\bin\Release base\ /e /y - copy /Y src\Jackett.Service\bin\Release\JackettService.exe* %APPVEYOR_BUILD_FOLDER%\build.windows\ + copy /Y src\Jackett.Service\bin\Release\JackettService.exe* %APPVEYOR_BUILD_FOLDER%\base\ - copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe* %APPVEYOR_BUILD_FOLDER%\build.windows\ + copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe* %APPVEYOR_BUILD_FOLDER%\base\ - copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe* %APPVEYOR_BUILD_FOLDER%\build.windows\ + copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe* %APPVEYOR_BUILD_FOLDER%\base\ - copy /Y LICENSE build.windows\LICENSE + copy /Y Upstart.config base\Upstart.config - copy /Y README.md build.windows\README.md + copy /Y LICENSE base\LICENSE + + copy /Y README.md base\README.md - xcopy build.windows WindowsBuild\Jackett\ /e /y + xcopy base build.windows\ /e /y - - msbuild src\Jackett.sln /t:Clean /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - "C:\Program Files (x86)\Mono\bin\xbuild.bat" src\Jackett.sln /t:Build /p:Configuration=Release /verbosity:minimal /tv:12.0 - - - xcopy src\Jackett.Console\bin\Release build.mono\ /e /y - - copy /Y src\Jackett.Service\bin\Release\JackettService.exe* %APPVEYOR_BUILD_FOLDER%\build.mono\ - - copy /Y src\Jackett.Tray\bin\Release\JackettTray.exe* %APPVEYOR_BUILD_FOLDER%\build.mono\ - - copy /Y src\Jackett.Updater\bin\Release\JackettUpdater.exe* %APPVEYOR_BUILD_FOLDER%\build.mono\ - - copy /Y LICENSE build.mono\LICENSE - - copy /Y README.md build.mono\README.md - - copy /Y Upstart.config build.mono\Upstart.config - - - xcopy build.mono MonoBuild\Jackett\ /e /y + xcopy base BaseBuild\Jackett\ /e /y "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" Installer.iss @@ -62,15 +46,10 @@ after_build: MOVE Output\Jackett.Installer.Windows.exe %APPVEYOR_BUILD_FOLDER% - cd WindowsBuild + cd BaseBuild 7z a -tzip -r "%APPVEYOR_BUILD_FOLDER%\Jackett.Binaries.Windows.zip" "Jackett\" - - cd %APPVEYOR_BUILD_FOLDER% - - cd MonoBuild - 7z a -ttar "%APPVEYOR_BUILD_FOLDER%\Jackett.Binaries.Mono.tar" "Jackett\" cd %APPVEYOR_BUILD_FOLDER% @@ -92,9 +71,9 @@ deploy: on: branch: master notifications: -- provider: GitHubPullRequest - auth_token: - secure: k6ZZACPbKcvAFiXe/uOmY6Ofs4aw2rgKEWMNA8EilQpdJ6o7ef31we4DPn3SXZzx +- provider: Webhook + url: https://skyhook.glitch.me/api/webhooks/346588605843767297/_VWi5abKliaWsBmQO7AX69tD28FhqSLjKyLBwkSwwT13uyWJQHx5TSWK_iAs-0RzmyvZ/appveyor + method: POST on_build_success: true on_build_failure: true on_build_status_changed: true \ No newline at end of file