Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit da13317

Browse files
authored
Merge pull request #56 from Creative-Rift/develop
Fix/tests (#55)
2 parents 7eeedab + e2d2a0e commit da13317

Some content is hidden

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

59 files changed

+1291
-1684
lines changed

.github/workflows/Test_linux.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
name: ShipWreck Engine Linux
22
on:
3-
push:
4-
branches:
5-
- master
6-
- develop
7-
pull_request:
8-
branches:
9-
- master
10-
- develop
113
workflow_dispatch:
124

135
env:

.github/workflows/Test_windows.yml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Module Test CI
1+
name: Engine tests Windows
22
on:
33
push:
44
branches:
@@ -9,11 +9,10 @@ on:
99
- master
1010
- develop
1111
workflow_dispatch:
12-
release:
13-
types: [published]
1412

1513
env:
16-
BUILD_TYPE: DEBUG
14+
BUILD_TYPE: Release
15+
LIBRARIES_VERSION: 1
1716

1817
jobs:
1918
Test_windows:
@@ -22,12 +21,29 @@ jobs:
2221
- name: Checkout repository
2322
uses: actions/checkout@v2
2423

25-
- name: Configure Environement
24+
- name: Download libraries
2625
run: |
27-
./check_for_update.sh -i
26+
Invoke-WebRequest -OutFile "libraries.exe" -Uri "https://api.creative-rift.com/api/download?platform=windows&v=${{env.LIBRARIES_VERSION}}&p=installer"
27+
.\libraries.exe > out.txt
28+
xcopy.exe /E /I .\libraries\${{env.LIBRARIES_VERSION}}\ .\libraries\
29+
30+
- name: Config tests
31+
run: |
32+
cd module\tests
33+
xcopy.exe ..\..\libraries\${{env.BUILD_TYPE}}\*.dll .\${{env.BUILD_TYPE}}\
34+
xcopy.exe ..\..\libraries\config.yaml .\${{env.BUILD_TYPE}}\
2835
mkdir build
2936
cd build
30-
cmake -B ${{github.workspace}}/build -G"Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
37+
cmake -B ${{github.workspace}}\module\tests\build -G"Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ..
38+
ls ${{github.workspace}}\module\tests\${{env.BUILD_TYPE}}
39+
40+
- name: Build tests
41+
run: |
42+
cd ${{github.workspace}}\module\tests\build
43+
cmake --build ${{github.workspace}}\module\tests\build --config ${{env.BUILD_TYPE}}
3144
32-
- name: Build
33-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j 9
45+
- name: Run tests
46+
run: |
47+
cd ${{github.workspace}}\module\tests\${{env.BUILD_TYPE}}
48+
ls
49+
.\SWEngine-tests.exe

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
style="height: 200px">
44
</p>
55

6-
# SWEngine-OpenGLModule ⚓
6+
# ShipWreck Engine OpenGLModule ⚓
77

88
## Description
99

10-
This module built with OpenGL and GLFW provide several components to build your graphical project.
11-
OpenGLModule support Linux and Windows platform. Check our [documentation](https://docs.creative-rift.com/) for more information.
10+
ShipWreck Engine is based on [OpenGL](https://www.opengl.org/) 4.6 and [GLFW](https://www.glfw.org/). \
11+
The goal is to provide several tools that allow to create easily games, animation, render, ... \
12+
Check our [documentation](https://docs.creative-rift.com/) for more information.
1213

1314
## Compilation
1415

@@ -17,21 +18,20 @@ To build the project simply use these commands:
1718
```bash
1819
mkdir build ; cd build
1920
cmake -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=[Debug/Release] ..
20-
cmake --build . --target Incaribus --config [Debug/Release]
21+
cmake --build . --target SWEngine-OpenGLModule --config [Debug/Release]
2122
```
2223

23-
The output program will be in `SWEngine-graphical/out/[Debug/Release]/SWEngine-OpenGLModule.dll`
24+
The output program will be in `out/[Debug/Release]/SWEngine-OpenGLModule.dll`
2425

2526
## Documentation
2627

2728
You can visit our [documentation](https://docs.creative-rift.com/graphical-module/opengl) for more information.
2829

2930
## Example
3031

31-
We have one example with this Module check out [Icaribus](https://github.com/Creative-Rift/Incaribus)
32+
We have one example with this Module check out [Incaribus](https://github.com/Creative-Rift/Incaribus)
3233

3334
## Author
3435

3536
Made on our ship with :heart: \
36-
[Guillaume Soisson](https://github.com/Alvarwow69) \
37-
[Guillaume Debard](https://github.com/SheItoon)
37+
[Guillaume Soisson](https://github.com/Alvarwow69)

core/tests/CMakeLists.txt

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

core/tests/includes/Engine_tests.hpp

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

0 commit comments

Comments
 (0)