build scripts update

.github/workflows/build-pr.yml

@@ -0,0 +1,146 @@
+name: Pull Request Verification
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      shell: cmd
+      run: |
+        "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /p:Configuration=Release /p:Platform=x64
+    
+    - name: Move binaries
+      shell: cmd
+      run: |
+        move BUILD\x64\Release\Editor_Windows\Editor_Windows.exe Editor\
+        xcopy WickedEngine\dxcompiler.dll Editor\
+        
+        move BUILD\x64\Release\Tests\Tests.exe Tests\
+        xcopy WickedEngine\dxcompiler.dll Tests\
+        
+    - name: Package Editor
+      uses: actions/upload-artifact@v2
+      with:
+        name: Editor (Windows x64)
+        path: |
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
+          WickedEngine/fonts/
+          images/
+          models/
+          scripts/
+          Documentation/
+          README.md
+          LICENSE.md
+          other_licenses.txt
+          features.txt
+          Editor/images/
+          Editor/sound/
+          Editor/*.ini
+          Editor/*.ico
+          Editor/*.lua
+          Editor/*.exe
+          Editor/*.dll
+          
+    - name: Package Tests
+      uses: actions/upload-artifact@v2
+      with:
+        name: Tests (Windows x64)
+        path: |
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
+          WickedEngine/fonts/
+          images/
+          models/
+          scripts/
+          Documentation/
+          README.md
+          LICENSE.md
+          other_licenses.txt
+          features.txt
+          Tests/images/
+          Tests/sound/
+          Tests/*.ini
+          Tests/*.ico
+          Tests/*.lua
+          Tests/*.ttf
+          Tests/*.exe
+          Tests/*.dll
+
+    
+  linux:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
+        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.2.148-focal.list https://packages.lunarg.com/vulkan/1.2.148/lunarg-vulkan-1.2.148-focal.list
+        sudo apt update
+        sudo apt install vulkan-sdk
+        sudo apt install libsdl2-dev
+
+    - name: Build
+      run: |
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_BUILD_TYPE=Release
+        make
+        
+    - name: Move binaries
+      run: |
+        mv build/Editor/WickedEngineEditor Editor/
+        mv build/Tests/Tests Tests/
+        
+    - name: Package Editor
+      uses: actions/upload-artifact@v2
+      with:
+        name: Editor (Ubuntu 20.04)
+        path: |
+          WickedEngine/shaders/
+          WickedEngine/fonts/
+          images/
+          models/
+          scripts/
+          Documentation/
+          README.md
+          LICENSE.md
+          other_licenses.txt
+          features.txt
+          Editor/images/
+          Editor/sound/
+          Editor/*.ini
+          Editor/*.ico
+          Editor/*.lua
+          Editor/WickedEngineEditor
+          
+    - name: Package Tests
+      uses: actions/upload-artifact@v2
+      with:
+        name: Tests (Ubuntu 20.04)
+        path: |
+          WickedEngine/shaders/
+          WickedEngine/fonts/
+          images/
+          models/
+          scripts/
+          Documentation/
+          README.md
+          LICENSE.md
+          other_licenses.txt
+          features.txt
+          Tests/images/
+          Tests/sound/
+          Tests/*.ini
+          Tests/*.ico
+          Tests/*.lua
+          Tests/*.ttf
+          Tests/Tests

.github/workflows/build.yml

@@ -3,8 +3,6 @@ name: Build
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   windows:
@@ -30,7 +28,9 @@ jobs:
       with:
         name: Editor (Windows x64)
         path: |
-          WickedEngine/shaders/
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
           WickedEngine/fonts/
           images/
           models/
@@ -53,7 +53,9 @@ jobs:
       with:
         name: Tests (Windows x64)
         path: |
-          WickedEngine/shaders/
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
           WickedEngine/fonts/
           images/
           models/
@@ -103,7 +105,9 @@ jobs:
       with:
         name: Editor (Ubuntu 20.04)
         path: |
-          WickedEngine/shaders/
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
           WickedEngine/fonts/
           images/
           models/
@@ -125,7 +129,9 @@ jobs:
       with:
         name: Tests (Ubuntu 20.04)
         path: |
-          WickedEngine/shaders/
+          WickedEngine/shaders/*.cso
+          WickedEngine/shaders/hlsl6/*.cso
+          WickedEngine/shaders/spirv/*.cso
           WickedEngine/fonts/
           images/
           models/

WickedEngine.sln

@@ -36,6 +36,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Supplementary", "Supplementary", "{BF8FCAB8-D7D3-4DAE-92DE-4B5037E9A0ED}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
+		.github\workflows\build-pr.yml = .github\workflows\build-pr.yml
 		.github\workflows\build.yml = .github\workflows\build.yml
 		features.txt = features.txt
 		LICENSE.md = LICENSE.md