Skip to content

Commit 38d5673

Browse files
authored
ci (#72)
* linter modification * cmake * move function to .cpp file * fix some files header and includes * unix dependencies
1 parent 9187771 commit 38d5673

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+245
-521
lines changed

.clang-format

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
DerivePointerAlignment: false
2+
PointerAlignment: Left
3+
4+
UseTab: ForIndentation
5+
TabWidth: 4
6+
IndentWidth: 4
7+
ColumnLimit: 120
8+
9+
BreakBeforeBraces: Allman
10+
Cpp11BracedListStyle: false
11+
12+
# space
13+
SpaceBeforeCpp11BracedList: true
14+
SpaceBeforeCtorInitializerColon: true
15+
SpacesInAngles: false
16+
17+
18+
Standard: c++17

.cspell.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

.editorconfig

Lines changed: 0 additions & 5 deletions
This file was deleted.

.gitattributes

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
###############################################################################
22
# Set default behavior to automatically normalize line endings.
3-
###############################################################################
43
* text=auto
54

6-
###############################################################################
75
# Set default behavior for command prompt diff.
86
#
97
# This is need for earlier builds of msysgit that does not have it on by
108
# default for csharp files.
119
# Note: This is only used by command line
12-
###############################################################################
1310
#*.cs diff=csharp
14-
15-
###############################################################################
1611
# Set the merge driver for project and solution files
17-
#
1812
# Merging from the command prompt will add diff markers to the files if there
1913
# are conflicts (Merging from VS is not affected by the settings below, in VS
2014
# the diff markers are never inserted). Diff markers may cause the following
2115
# file extensions to fail to load in VS. An alternative would be to treat
2216
# these files as binary and thus will always conflict and require user
2317
# intervention with every merge. To do so, just uncomment the entries below
24-
###############################################################################
2518
#*.sln merge=binary
2619
#*.csproj merge=binary
2720
#*.vbproj merge=binary
@@ -34,23 +27,16 @@
3427
#*.modelproj merge=binary
3528
#*.sqlproj merge=binary
3629
#*.wwaproj merge=binary
37-
38-
###############################################################################
3930
# behavior for image files
40-
#
4131
# image files are treated as binary by default.
42-
###############################################################################
4332
#*.jpg binary
4433
#*.png binary
4534
#*.gif binary
46-
47-
###############################################################################
4835
# diff behavior for common document formats
4936
#
5037
# Convert binary document formats to text before diffing them. This feature
5138
# is only available from the command line. Turn it on by uncommenting the
5239
# entries below.
53-
###############################################################################
5440
#*.doc diff=astextplain
5541
#*.DOC diff=astextplain
5642
#*.docx diff=astextplain
@@ -61,3 +47,4 @@
6147
#*.PDF diff=astextplain
6248
#*.rtf diff=astextplain
6349
#*.RTF diff=astextplain
50+
*.so.* filter=lfs diff=lfs merge=lfs -text

.github/workflows/gcc-build.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: gcc_linux
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
linux_gcc:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v1
11+
- uses: lukka/get-cmake@v3.19.0
12+
- name: Download Dependencies
13+
run: |
14+
sudo apt-get install -y build-essential pkg-config gcc-10 g++-10 xorg-dev libglu1-mesa-dev libopenal-dev libvulkan-dev wget libwayland-dev libxrandr-dev libassimp-dev ninja-build
15+
mkdir VULKAN_SDK
16+
BRANCH=$(curl https://sdk.lunarg.com/sdk/download/1.2.170.0/linux/SDK-1.2.170.0-CONFIG.json | jq '.repos["Vulkan-Headers"].branch' --raw-output)
17+
echo BRANCH=$BRANCH >&2
18+
mkdir VULKAN_SDK/_build
19+
pushd VULKAN_SDK/_build >&2
20+
git clone https://github.com/KhronosGroup/Vulkan-Headers.git --branch $BRANCH >&2
21+
pushd Vulkan-Headers >&2
22+
cmake -DCMAKE_INSTALL_PREFIX=../.. -DCMAKE_BUILD_TYPE=Release . >&2
23+
cmake --build . --config Release >&2
24+
cmake --install . >&2
25+
popd >&2
26+
git clone https://github.com/KhronosGroup/Vulkan-Loader.git --branch $BRANCH >&2
27+
pushd Vulkan-Loader >&2
28+
cmake -DVULKAN_HEADERS_INSTALL_DIR=../.. -DCMAKE_INSTALL_PREFIX=../.. -DCMAKE_BUILD_TYPE=Release . >&2
29+
cmake --build . --config Release >&2
30+
cmake --install . >&2
31+
popd >&2
32+
popd >&2
33+
export VULKAN_SDK_VERSION=$BRANCH
34+
VULKAN_SDK=$PWD/VULKAN_SDK
35+
echo VULKAN_SDK_VERSION=$VULKAN_SDK_VERSION
36+
echo VULKAN_SDK=$VULKAN_SDK
37+
rm -rf VULKAN_SDK/_build >&2
38+
echo "VULKAN_SDK/" >&2
39+
ls VULKAN_SDK >&2
40+
du -hs VULKAN_SDK >&2
41+
42+
- name: Build
43+
env:
44+
CC: gcc-10
45+
CXX: g++-10
46+
LD_LIBRARY_PATH: /usr/bin/g++-10/lib
47+
VULKAN_SDK: /home/runner/work/R3D_Engine/R3D_Engine/VULKAN_SDK
48+
run: |
49+
cmake --version
50+
ninja --version
51+
cmake -B Build -DCMAKE_BUILD_TYPE=Debug
52+
cmake --build Build

.github/workflows/linter.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Linter
2+
3+
on: [push]
4+
5+
jobs:
6+
cpp_style_check:
7+
runs-on: ubuntu-latest
8+
name: Check C++ Style
9+
steps:
10+
- name: Checkout this commit
11+
uses: actions/checkout@v2
12+
- name: Run clang-format style check for C/C++ programs.
13+
uses: jidicula/clang-format-action@v3.4.0
14+
with:
15+
clang-format-version: '11'
16+
check-path: 'Engine'
17+
fallback-style: 'GNU'

.github/workflows/mega-linter.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ bld/
2727
[Bb]in/
2828
[Oo]bj/
2929
[Ll]og/
30+
build/
3031

3132
# Visual Studio 2015 cache/options directory
3233
.vs/

0 commit comments

Comments
 (0)