Add .editorconfig entry for .yml files

mikke89 · Dec 2, 2023 · f63c4b5 · f63c4b5
1 parent c025b63
commit f63c4b5
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -26,7 +26,7 @@ install:
     unzip -o freetype.zip -d freetype_tmp
     mv freetype_tmp/include include
     mv freetype_tmp/%PLATFORM_NAME% lib
-    
+
     git clone --depth 1 --branch v0.2 https://github.com/Samsung/rlottie.git
     cd rlottie
     mkdir build
@@ -35,7 +35,7 @@ install:
     cmake --build . --target rlottie --config Debug -- "/clp:ErrorsOnly"
     cmake --build . --target rlottie --config Release -- "/clp:ErrorsOnly"
     cd ../../
-    
+
     git clone --depth 1 --branch v2.3.1 https://github.com/sammycage/lunasvg.git
     cd lunasvg
     mkdir build
@@ -44,33 +44,33 @@ install:
     cmake --build . --target lunasvg --config Debug -- "/clp:ErrorsOnly"
     cmake --build . --target lunasvg --config Release -- "/clp:ErrorsOnly"
     cd ../../
-    
+
     cd ..
     mkdir Build-Dynamic, Build-Static, Build-Samples
-    
+
     cd Build-Dynamic
     cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SAMPLES=OFF -DWARNINGS_AS_ERRORS=ON ..
 
     cd ../Build-Static
     cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_SAMPLES=OFF -DWARNINGS_AS_ERRORS=ON ..
-    
+
     cd ../Build-Samples
     cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DENABLE_LOTTIE_PLUGIN=ON -DENABLE_SVG_PLUGIN=ON -DBUILD_SAMPLES=ON -DWARNINGS_AS_ERRORS=ON ..
-    
+
     cd ..
-    
+
 build_script:
 - cmd: |-
     msbuild Build-Dynamic/RmlUi.sln /p:configuration=debug   /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    
+
     msbuild Build-Dynamic/RmlUi.sln /p:configuration=release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    
+
     msbuild Build-Static/RmlUi.sln  /p:configuration=debug   /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    
+
     msbuild Build-Static/RmlUi.sln  /p:configuration=release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    
+
     msbuild Build-Samples/RmlUi.sln  /p:configuration=release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-    
+
 after_build:
 - cmd: |-
     mkdir Bin
@@ -81,42 +81,42 @@ after_build:
     cp ../Build-Static/Debug/Rml*.{lib,pdb} Static-Debug
     cp ../Build-Static/Release/Rml*.lib Static-Release
     cd ..
-    
+
     cp Build-Samples/Release/*.exe Samples
     cp Build-Samples/Release/Rml*.dll Samples
     cp Dependencies/lib/*.dll Samples
 
     mv Dependencies/lib/ Dependencies/freetype-%FREETYPE_VER%
     cp Dependencies/freetype_tmp/*.TXT Dependencies/freetype-%FREETYPE_VER%
-    
+
     IF NOT "%APPVEYOR_REPO_TAG_NAME%"=="" SET RMLUI_VERSION= %APPVEYOR_REPO_TAG_NAME%
-    
+
     echo RmlUi%RMLUI_VERSION% library and sample binaries for %PLATFORM_NAME%.> Build.txt& echo.>>Build.txt
     echo https://github.com/mikke89/RmlUi>> Build.txt& echo.>>Build.txt
     echo Built using %VS_GENERATOR% on %APPVEYOR_REPO_COMMIT_TIMESTAMP:~0,10% (build %APPVEYOR_BUILD_NUMBER%).>> Build.txt
     echo Commit id: %APPVEYOR_REPO_COMMIT%.>> Build.txt
-    
+
     cd Dependencies/rlottie/
     echo The rlottie library includes source code licensed under Mozilla Public License Version 2.0.> MPL_SOURCE.txt
     echo The source for this code can be found in the rlottie library at the following URL:>> MPL_SOURCE.txt
     echo https://github.com/Samsung/rlottie/blob/29b391b95913877b7234543da8b4a9ec6d8175d0/src/vector/vinterpolator.cpp>> MPL_SOURCE.txt
     cd ../..
-    
+
     cp Include/RmlUi/Core/Containers/LICENSE.txt LICENSE.Core.ThirdParty.txt
     cp Source/Debugger/LICENSE.txt LICENSE.Debugger.ThirdParty.txt
-    
+
     7z a RmlUi-%VS_SHORTNAME%-%PLATFORM_NAME%.zip Backends/ Bin/ Include/ Samples/ Build.txt readme.md changelog.md LICENSE* Dependencies/freetype-%FREETYPE_VER%/ Dependencies/rlottie/COPYING Dependencies/rlottie/MPL_SOURCE.txt Dependencies/rlottie/licenses/ Dependencies/lunasvg/LICENSE
-    
+
     mkdir Samples\Dependencies\freetype-%FREETYPE_VER%, Samples\Dependencies\rlottie, Samples\Dependencies\rlottie\licenses, Samples\Dependencies\lunasvg
     cp LICENSE* Samples
     cp Dependencies/freetype-%FREETYPE_VER%/*.TXT Samples/Dependencies/freetype-%FREETYPE_VER%
     cp Dependencies/rlottie/COPYING Samples/Dependencies/rlottie
     cp Dependencies/rlottie/MPL_SOURCE.txt Samples/Dependencies/rlottie
     cp Dependencies/rlottie/licenses/* Samples/Dependencies/rlottie/licenses
     cp Dependencies/lunasvg/LICENSE Samples/Dependencies/lunasvg
-    
+
     IF "%PLATFORM_NAME%"=="win64" 7z a RmlUi-%PLATFORM_NAME%-samples-only.zip .\Samples\* -r -xr!src\ -x!shell\ -x!luainvaders\
-    
+
 for:
 -
   matrix:
@@ -126,15 +126,15 @@ for:
   - cmd: |-
       C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-freetype mingw-w64-x86_64-lua"
       C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-sfml mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-glew"
-      
+
       mkdir Build
       cd Build
-      
+
       set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
       set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
       set GLEW_INCLUDE_DIR=C:/msys64/mingw64/include/GL
       set GLEW_LIBRARIES=C:/msys64/mingw64/lib/libglew32.dll.a
-      
+
       cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_SAMPLES=ON -DBUILD_LUA_BINDINGS=ON -DWARNINGS_AS_ERRORS=OFF -DCMAKE_C_COMPILER=gcc.exe -DCMAKE_CXX_COMPILER=g++.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DGLEW_INCLUDE_DIR=%GLEW_INCLUDE_DIR% -DGLEW_LIBRARIES=%GLEW_LIBRARIES% ..
 
       set CHERE_INVOKING=yes
@@ -143,7 +143,7 @@ for:
   build_script:
   - cmd: |-
       C:\msys64\usr\bin\bash -lc "mingw32-make.exe -j4"
-      
+
   after_build:
   - cmd: |-
       ls {*.exe,*.dll} -s -h -X

diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,9 @@ insert_final_newline = true
 indent_style = tab
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,12 +5,12 @@ on: [push, pull_request]
 jobs:
   Linux:
     runs-on: ubuntu-20.04
-    
+
     env:
       BUILD_TYPE: Release
       CC: ${{ matrix.cc }}
       CXX: ${{ matrix.cxx }}
-  
+
     strategy:
       fail-fast: false
       matrix:
@@ -20,7 +20,7 @@ jobs:
             cmake_options: -DENABLE_PRECOMPILED_HEADERS=OFF -DSAMPLES_BACKEND=GLFW_GL2
           - cc: clang
             cxx: clang++
-            cmake_options: -DSAMPLES_BACKEND=SDL_VK
+            cmake_options: -DBUILD_TESTING=ON -DSAMPLES_BACKEND=SDL_VK -DCMAKE_BUILD_TYPE=Debug
           - cmake_options: -DBUILD_TESTING=ON -DENABLE_PRECOMPILED_HEADERS=OFF
             enable_testing: true
           - cmake_options: -DNO_FONT_INTERFACE_DEFAULT=ON -DENABLE_LOTTIE_PLUGIN=ON -DSAMPLES_BACKEND=X11_GL2
@@ -30,12 +30,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      
+
     - name: Install Dependencies
       run: |-
         sudo apt-get update
         sudo apt-get install cmake ninja-build libsdl2-dev libsdl2-image-dev libfreetype6-dev libglew-dev liblua5.2-dev libsfml-dev librlottie-dev libglfw3-dev
-      
+
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/Build
 
@@ -57,23 +57,23 @@ jobs:
 
   macOS:
     runs-on: macos-latest
-    
+
     env:
       BUILD_TYPE: Release
-    
+
     strategy:
       fail-fast: false
       matrix:
         include:
           - cmake_options: -DSAMPLES_BACKEND=auto
           - cmake_options: -DSAMPLES_BACKEND=GLFW_GL2
-    
+
     steps:
     - uses: actions/checkout@v3
-      
+
     - name: Install Dependencies
       run: brew install lua sdl2 sdl2_image glfw
-      
+
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/Build
 
@@ -90,25 +90,25 @@ jobs:
 
   Windows:
     runs-on: windows-latest
-    
+
     env:
       BUILD_TYPE: Release
       VCPKG_DEFAULT_TRIPLET: x64-windows
-    
+
     strategy:
       fail-fast: false
       matrix:
         include:
           - cmake_options: -DSAMPLES_BACKEND=auto -DENABLE_PRECOMPILED_HEADERS=OFF
           - cmake_options: -DSAMPLES_BACKEND=Win32_VK -DRMLUI_VK_DEBUG=ON
           - cmake_options: -DSAMPLES_BACKEND=SDL_VK -DBUILD_LUA_BINDINGS_FOR_LUAJIT=ON
-    
+
     steps:
     - uses: actions/checkout@v3
-      
+
     - name: Install Dependencies
       run: C:\vcpkg\vcpkg install freetype[core] sdl2[core,vulkan] lua[core] luajit
-      
+
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/Build
 
@@ -138,10 +138,10 @@ jobs:
         emsdk-master/emsdk update
         emsdk-master/emsdk install latest
         emsdk-master/emsdk activate latest
-              
+
     - name: Create Build Environment
       run: cmake -E make_directory Build
-      
+
     - name: Configure CMake
       run: |-
         source emsdk-master/emsdk_env.sh