From: j-p <jp_bruyere@hotmail.com>
Date: Wed, 29 Jan 2020 03:03:14 +0000 (+0100)
Subject: Appveyor (#28)
X-Git-Tag: v0.1-alpha~37
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=4a560f9a29313bf5c68afd99644c97871a478ada;p=jp%2Fvkvg.git

Appveyor (#28)

* test artifacts and linux build for appveyor
* add apt install harfbuzz-dev and libglfw3-dev to appveyor ubuntu
---

diff --git a/appveyor.yml b/appveyor.yml
index 740d293..f48ab56 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,24 +1,61 @@
 version: 0.1.{build}
 
-environment:
-    VCPKG_DEFAULT_TRIPLET: x64-windows
-    VULKAN_SDK: C:/VulkanSDK/1.1.130.0
-    APPVEYOR_SAVE_CACHE_ON_ERROR: true
-
-install:
-    - if not exist VulkanSDK.exe curl -L --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.130.0/windows/VulkanSDK-1.1.130.0-Installer.exe?Human=true && VulkanSDK.exe /S
-    - vcpkg install freetype harfbuzz fontconfig glfw3
-cache:
-    - VulkanSDK.exe
-    - c:\tools\vcpkg\installed\
-    - c:\VulkanSDK\
-
-before_build:
-    - git submodule update --init --recursive
-    - mkdir build
-    - cd build
-    - cmake -G "Visual Studio 14 Win64" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-
-build_script:
-    - msbuild vkvg.sln /p:Configuration=Debug /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+image:
+  - Visual Studio 2019
+  - Ubuntu
+
+artifacts:
+    - path: 'vkvg.zip'
+      name: vkvg
+      type: zip
+
+for:
+  -
+    matrix:
+      only:
+        - image: Visual Studio 2019
+    environment:
+        VCPKG_DEFAULT_TRIPLET: x64-windows
+        VULKAN_SDK: C:/VulkanSDK/1.1.130.0
+        APPVEYOR_SAVE_CACHE_ON_ERROR: true
+    cache:
+        - VulkanSDK.exe
+        - c:\tools\vcpkg\installed\
+        - c:\VulkanSDK\
+    install:
+        - if not exist VulkanSDK.exe curl -L --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.130.0/windows/VulkanSDK-1.1.130.0-Installer.exe?Human=true && VulkanSDK.exe /S
+        - vcpkg install freetype harfbuzz fontconfig glfw3
+    before_build:
+        - git submodule update --init --recursive
+        - mkdir build
+        - cd build
+        - cmake -G "Visual Studio 14 Win64" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+    build_script:
+        - msbuild vkvg.sln /p:Configuration=Debug /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    after_build:
+        - 7z a vkvg.zip %APPVEYOR_BUILD_FOLDER%\build\*.dll %APPVEYOR_BUILD_FOLDER%\build\*.exe %APPVEYOR_BUILD_FOLDER%\build\*.lib
+
+  -
+    matrix:
+      only:
+        - image: Ubuntu
+    install:
+        - wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
+        - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-bionic.list https://packages.lunarg.com/vulkan/lunarg-vulkan-bionic.list 
+        - sudo apt -qq update
+        - sudo apt -y install vulkan-sdk libharfbuzz-dev libglfw3-dev
+    before_build:
+        - git submodule update --init --recursive
+        - mkdir build
+        - cd build
+        - cmake ..
+    build_script:
+        - make
+    after_build:
+        - 7z a vkvg.zip %APPVEYOR_BUILD_FOLDER%\build\*.so* %APPVEYOR_BUILD_FOLDER%\build\test_*
+    
+
+
+
+