Skip to content

Commit e744ae6

Browse files
authored
Merge pull request #92 from AsPJT/develop
v1.0.0 MESOPOTAMIA
2 parents e0daf97 + 06bb1a1 commit e744ae6

File tree

17,701 files changed

+159905
-12398
lines changed

Some content is hidden

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

17,701 files changed

+159905
-12398
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
root = true
2+
[*]
3+
charset = utf-8-bom
4+
end_of_line = lf
5+
indent_size = 4
6+
indent_style = space
7+
trim_trailing_whitespace = true
8+
insert_final_newline = true

.github/workflows/area-calculate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
44

55
env:
66
BUILD_TYPE: Debug
7-
WORK_SPACE: ${{github.workspace}}/Project
7+
WORK_SPACE: ${{github.workspace}}/Projects
88
TARGET: AreaCalculate
99
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
1010

.github/workflows/cmake-all-build.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
name: CMake-All-Build
1+
name: CMake-All-Build
22

33
on:
44
pull_request:
5-
branches: [ main ]
65

76
env:
87
BUILD_TYPE: Debug
9-
WORK_SPACE: ${{github.workspace}}/Project
8+
WORK_SPACE: ${{github.workspace}}/Projects
109

1110
jobs:
1211
build:
13-
runs-on: ubuntu-latest
14-
12+
runs-on: ubuntu-20.04
13+
1514
strategy:
1615
matrix:
1716
compiler: [g++, clang++]
@@ -21,22 +20,21 @@ jobs:
2120
uses: actions/checkout@v3
2221

2322
- name: Checkout submodules
24-
run: git submodule update --init --recursive ExternalLibrary/googletest
23+
run: |
24+
git submodule update --init --recursive ExternalLibrary/googletest
25+
git submodule update --init --recursive ExternalLibrary/stb
2526
2627
- name: Install dependencies
2728
run: |
2829
sudo apt-get clean
2930
sudo apt-get update
3031
sudo apt-get install libopencv-dev
31-
sudo apt-get install libsfml-dev
3232
sudo apt-get install cmake
33-
sudo apt-get install g++
3433
3534
- name: Configure CMake
3635
run: |
3736
mkdir ${{github.workspace}}/build
38-
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
37+
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
3938
4039
- name: Build
4140
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
42-

.github/workflows/cmake-build-on-push.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
name: CMake-Build-On-Push
1+
name: CMake-Build-On-Push
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches:
6+
- main
67

78
env:
89
BUILD_TYPE: Debug
9-
WORK_SPACE: ${{github.workspace}}/Project
10+
WORK_SPACE: ${{github.workspace}}/Projects
1011

1112
jobs:
1213
build:
13-
runs-on: ubuntu-latest
14-
14+
runs-on: ubuntu-ubuntu-20.04
15+
1516
strategy:
1617
matrix:
1718
compiler: [g++, clang++]
@@ -21,7 +22,9 @@ jobs:
2122
uses: actions/checkout@v3
2223

2324
- name: Checkout submodules
24-
run: git submodule update --init --recursive ExternalLibrary/googletest
25+
run: |
26+
git submodule update --init --recursive ExternalLibrary/googletest
27+
git submodule update --init --recursive ExternalLibrary/stb
2528
2629
- name: Install dependencies
2730
run: |
@@ -34,8 +37,7 @@ jobs:
3437
- name: Configure CMake
3538
run: |
3639
mkdir ${{github.workspace}}/build
37-
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
40+
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
3841
3942
- name: Build
4043
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
41-

.github/workflows/cmake-unit-test.yml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,42 @@
1-
name: CMake-Unit-Test
1+
name: CMake-Unit-Test
22

33
on:
4-
push:
5-
branches: [ main ]
64
pull_request:
7-
branches: [ main ]
85

96
env:
107
BUILD_TYPE: Debug
11-
WORK_SPACE: ${{github.workspace}}/Project
8+
WORK_SPACE: ${{github.workspace}}/Projects
129
TEST_DIR: UnitTest
1310

1411
jobs:
1512
build:
16-
runs-on: ubuntu-latest
17-
18-
strategy:
19-
matrix:
20-
compiler: [g++, clang++]
13+
runs-on: ubuntu-20.04
2114

2215
steps:
2316
- name: Checkout
2417
uses: actions/checkout@v3
2518

2619
- name: Checkout submodules
27-
run: git submodule update --init --recursive ExternalLibrary/googletest
20+
run: |
21+
git submodule update --init --recursive ExternalLibrary/googletest
22+
git submodule update --init --recursive ExternalLibrary/stb
2823
2924
- name: Install dependencies
3025
run: |
3126
sudo apt-get clean
3227
sudo apt-get update
3328
sudo apt-get install libsfml-dev
3429
sudo apt-get install cmake
35-
sudo apt-get install g++
3630
3731
- name: Configure CMake
3832
run: |
3933
mkdir ${{github.workspace}}/build
40-
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}}/${{env.TEST_DIR}} -G "Unix Makefiles"
41-
34+
cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}}/${{env.TEST_DIR}} -G "Unix Makefiles"
35+
4236
- name: Build
4337
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
4438

45-
- name: Run tests
39+
- name: Run tests
4640
run: |
47-
cd ${{env.WORK_SPACE}}/${{env.TEST_DIR}}/bin/
48-
for file in *; do
49-
if [[ -x "$file" ]]; then
50-
./"$file"
51-
fi
52-
done
53-
54-
41+
cd ${{github.workspace}}/build
42+
ctest

.github/workflows/color-count.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
44

55
env:
66
BUILD_TYPE: Debug
7-
WORK_SPACE: ${{github.workspace}}/Project
7+
WORK_SPACE: ${{github.workspace}}/Projects
88
TARGET: ColorCount
99
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1010

.github/workflows/cppcheck.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: cppcheck
2+
3+
on: [pull_request]
4+
5+
env:
6+
WORKSPACE: ${{ github.workspace }}
7+
8+
jobs:
9+
cppcheck:
10+
runs-on: ubuntu-20.04
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3
15+
16+
- name: Setup cppcheck
17+
run: |
18+
sudo apt-get update
19+
sudo apt-get install cppcheck
20+
21+
- name: Run cppcheck
22+
run: |
23+
cd ${{ env.WORKSPACE }}
24+
cppcheck --enable=all --output-file=cppcheck-result.txt --force --quiet -I Library Projects
25+
26+
- name: Setup reviewdog
27+
uses: reviewdog/action-setup@80a06617492b461a66508e2dedf16233f0506804
28+
29+
- name: Comment GitHub Pull Request
30+
env:
31+
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
run: |
33+
cat cppcheck-result.txt | grep "\bwarning: " | reviewdog -efm="%f:%l:%c:%m" -reporter=github-pr-review -name="cppcheck-warning"
34+
cat cppcheck-result.txt | grep "\berror: " | reviewdog -efm="%f:%l:%c:%m" -reporter=github-pr-review -name="cppcheck-error"
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Generate-Doxygen
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-20.04
11+
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3
15+
16+
- name: Install Doxygen and Graphviz
17+
run: sudo apt-get install doxygen graphviz
18+
19+
- name: Generate Documentation
20+
run: |
21+
cd ${{github.workspace}}/Document/Doxygen
22+
doxygen Doxyfile
23+
24+
- name: Deploy to GitHub Pages
25+
uses: JamesIves/[email protected]
26+
with:
27+
branch: gh-pages
28+
folder: ${{github.workspace}}/Document/Doxygen/html

.github/workflows/image-combine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
44

55
env:
66
BUILD_TYPE: Debug
7-
WORK_SPACE: ${{github.workspace}}/Project
7+
WORK_SPACE: ${{github.workspace}}/Projects
88
TARGET: ImageCombine
99
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1010

.github/workflows/image-resize.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
44

55
env:
66
BUILD_TYPE: Debug
7-
WORK_SPACE: ${{github.workspace}}/Project
7+
WORK_SPACE: ${{github.workspace}}/Projects
88
TARGET: ImageResize
99

1010
jobs:

0 commit comments

Comments
 (0)