mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1464 from asuessenbach/CI

Browse Source 
Adjust ci-ubuntu.yml to latest changes of runners.
This commit is contained in:
Andreas Süßenbach 2022-12-11 22:40:16 +01:00 committed by GitHub
commit c9faef1d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci-ubuntu.yml vendored
View File

@ -15,9 +15,10 @@ jobs:
compiler: compiler:
- {cxx: "g++-9", c: "gcc-9"} - {cxx: "g++-9", c: "gcc-9"}
- {cxx: "g++-10", c: "gcc-10"} - {cxx: "g++-10", c: "gcc-10"}
- {cxx: "clang++-10", c: "clang-10"} - {cxx: "g++-11", c: "gcc-11"}
- {cxx: "clang++-11", c: "clang-11"}
- {cxx: "clang++-12", c: "clang-12"} - {cxx: "clang++-12", c: "clang-12"}
- {cxx: "clang++-13", c: "clang-13"}
- {cxx: "clang++-14", c: "clang-14"}
cxx_standard: [11, 14, 17, 20] cxx_standard: [11, 14, 17, 20]
steps: steps:

7
.github/workflows/ci-windows.yml vendored
View File

@ -21,18 +21,13 @@ jobs:
- name: Update Submodules - name: Update Submodules
run: git submodule update --init --recursive run: git submodule update --init --recursive
- name: Install Ninja
uses: ashutoshvarma/setup-ninja@master
with:
version: 1.11.0
- name: Setup MSVC - name: Setup MSVC
uses: TheMrMilchmann/setup-msvc-dev@v1 uses: TheMrMilchmann/setup-msvc-dev@v1
with: with:
arch: ${{matrix.architecture}} arch: ${{matrix.architecture}}
- name: Configure CMake - name: Configure CMake
run: cmake -B ${{github.workspace}}/build -GNinja run: cmake -B ${{github.workspace}}/build
-DSAMPLES_BUILD=ON -DSAMPLES_BUILD=ON
-DSAMPLES_BUILD_ONLY_DYNAMIC=ON -DSAMPLES_BUILD_ONLY_DYNAMIC=ON
-DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON

5
VulkanHppGenerator.cpp
View File

@ -12966,11 +12966,6 @@ void VulkanHppGenerator::setVulkanLicenseHeader( int line, std::string const & c
{ {
m_vulkanLicenseHeader.replace( pos, 1, "\n// " ); m_vulkanLicenseHeader.replace( pos, 1, "\n// " );
} }
// replace any " \n" with "\n"
for ( size_t pos = m_vulkanLicenseHeader.find( " \n" ); pos != std::string::npos; pos = m_vulkanLicenseHeader.find( " \n", pos ) )
{
m_vulkanLicenseHeader.replace( pos, 2, "\n" );
}
// remove any trailing spaces // remove any trailing spaces
m_vulkanLicenseHeader = trimEnd( m_vulkanLicenseHeader ); m_vulkanLicenseHeader = trimEnd( m_vulkanLicenseHeader );