1 files changed, 21 insertions, 56 deletions

diff --git a/appveyor.yml b/appveyor.yml
index bb3847585..ac6ef7c1a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,10 @@ image:
 - Visual Studio 2019
 - Visual Studio 2017
 
+branches:
+  only:
+    - master
+
 # Set up environment variables for build info
 environment:
   CUBERITE_BUILD_SERIES_NAME: AppVeyor
@@ -12,17 +16,17 @@ environment:
   CUBERITE_BUILD_DATETIME: "%APPVEYOR_REPO_COMMIT_TIMESTAMP%"
 
   matrix:
-  - job_name: Windows-x64-debug
+  - job_name: Windows-x64-Debug
     configuration: Debug
-    BUILD_DIR: Debug-x64
+    BUILD_DIR: Debug x64
 
   - job_name: Windows-x86
     configuration: Release
-    BUILD_DIR: Release-x86
+    BUILD_DIR: Release x86
 
   - job_name: Windows-x64
     configuration: Release
-    BUILD_DIR: Release-x64
+    BUILD_DIR: Release x64
 
 matrix:
   exclude:
@@ -31,10 +35,18 @@ matrix:
     - image: Visual Studio 2019
       configuration: Debug
 
+build:
+  project: '%BUILD_DIR%\Cuberite.sln'
+  parallel: true
+  verbosity: minimal
+
+pull_requests:
+  do_not_increment_build_number: true
 
 install:
-- echo %TIME%
 - git submodule update --init
+- if not exist "%BUILD_DIR%" mkdir "%BUILD_DIR%"
+- cd "%BUILD_DIR%"
 
 for:
 ##############################
@@ -43,21 +55,11 @@ for:
 -
   matrix:
     only:
-      - job_name: Windows-x64-debug
+      - job_name: Windows-x64-Debug
 
   before_build:
-  - if not exist %BUILD_DIR% mkdir %BUILD_DIR%
-  - cd %BUILD_DIR%
-  - echo %TIME%
   # TODO: re-add -DSELF_TEST=YES -DBUILD_TOOLS=YES once PCH for tools enabled (too slow otherwise)
-  - cmake -G "Visual Studio 15 2017" -A "x64" -DSELF_TEST=NO -DBUILD_TOOLS=NO ..
-  - echo %TIME%
-  - cd ..
-
-  build:
-    project: Debug-x64\Cuberite.sln
-    parallel: true
-    verbosity: minimal
+  - cmake -G "Visual Studio 15 2017" -DSELF_TEST=No -DBUILD_TOOLS=No ..
 
 ################################
 # Windows 32-bit release build #
@@ -67,22 +69,8 @@ for:
     only:
       - job_name: Windows-x86
 
-  branches:
-    only:
-      - master
-
   before_build:
-  - if not exist %BUILD_DIR% mkdir %BUILD_DIR%
-  - cd %BUILD_DIR%
-  - echo %TIME%
   - cmake -G "Visual Studio 16 2019" ..
-  - echo %TIME%
-  - cd ..
-
-  build:
-    project: Release-x86\Cuberite.sln
-    parallel: true
-    verbosity: minimal
 
 ################################
 # Windows 64-bit release build #
@@ -92,41 +80,18 @@ for:
     only:
       - job_name: Windows-x64
 
-  branches:
-    only:
-      - master
-
   before_build:
-  - if not exist %BUILD_DIR% mkdir %BUILD_DIR%
-  - cd %BUILD_DIR%
-  - echo %TIME%
   - cmake -G "Visual Studio 16 2019" -A "x64" ..
-  - echo %TIME%
-  - cd ..
-
-  build:
-    project: Release-x64\Cuberite.sln
-    parallel: true
-    verbosity: minimal
 
 ###########################################
 # Cache for speeding up subsequent builds #
 ###########################################
 cache:
-  - Debug-x64\CMakeCache.txt
-  - Release-x86\CMakeCache.txt
-  - Release-x64\CMakeCache.txt
+  - '%BUILD_DIR%\CMakeCache.txt'
 
 #####################
 # Package artifacts #
 #####################
-
 after_build:
-- cd %BUILD_DIR%\Server
-- echo Cuberite %APPVEYOR_JOB_NAME%-#%APPVEYOR_BUILD_NUMBER%  1>buildinfo.txt
+- cd Server
 - Install\PackWindowsExecutables.cmd
-- appveyor PushArtifact Cuberite.zip -FileName Cuberite.zip
-- appveyor PushArtifact PDBs.zip -FileName PDBs.zip
-- appveyor PushArtifact AutoAPI.zip -FileName AutoAPI.zip
-- appveyor PushArtifact ManualAPI.zip -FileName ManualAPI.zip
-- appveyor PushArtifact .luacheckrc -FileName .luacheckrc