Skip to content

Commit 4bce4bc

Browse files
azhirnovTheMostDiligent
azhirnov
authored and
TheMostDiligent
committed
CI: added pre-check with format validation (closed #163)
1 parent f55d55c commit 4bce4bc

12 files changed

Lines changed: 130 additions & 261 deletions

File tree

‎.github/workflows/android.yml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,14 @@ on: [push, pull_request]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8-
name: Android
8+
name: Linux -> Android-ARM32-ARM64
99

1010
steps:
1111
- name: Clone repository
1212
uses: actions/checkout@v2
1313
with:
1414
submodules: recursive
1515

16-
- name: DiligentCore format validation
17-
shell: bash
18-
run: |
19-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
20-
./validate_format_linux.sh
21-
22-
- name: DiligentTools format validation
23-
shell: bash
24-
run: |
25-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
26-
./validate_format_linux.sh
27-
28-
- name: DiligentFX format validation
29-
shell: bash
30-
run: |
31-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
32-
./validate_format_linux.sh
33-
34-
- name: DiligentSamples format validation
35-
shell: bash
36-
run: |
37-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
38-
./validate_format_linux.sh
39-
4016
- name: Set up Java 8
4117
if: success()
4218
uses: actions/setup-java@v1

‎.github/workflows/ios.yml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,14 @@ jobs:
99
config: [Debug, Release]
1010

1111
runs-on: macos-latest
12-
name: iOS, ${{ matrix.config }}
12+
name: MacOS -> iOS, ${{ matrix.config }}
1313

1414
steps:
1515
- name: Clone repository
1616
uses: actions/checkout@v2
1717
with:
1818
submodules: recursive
1919

20-
- name: DiligentCore format validation
21-
shell: bash
22-
run: |
23-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
24-
./validate_format_mac.sh
25-
26-
- name: DiligentTools format validation
27-
shell: bash
28-
run: |
29-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
30-
./validate_format_mac.sh
31-
32-
- name: DiligentFX format validation
33-
shell: bash
34-
run: |
35-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
36-
./validate_format_mac.sh
37-
38-
- name: DiligentSamples format validation
39-
shell: bash
40-
run: |
41-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
42-
./validate_format_mac.sh
43-
4420
- name: Download Vulkan SDK
4521
if: success()
4622
shell: bash

‎.github/workflows/linux.yml‎

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,14 @@ jobs:
99
config: [Debug, Release]
1010

1111
runs-on: ubuntu-latest
12-
name: Linux x64, GCC 9, ${{ matrix.config }}
12+
name: Linux -> x64, GCC 9, ${{ matrix.config }}
1313

1414
steps:
1515
- name: Clone repository
1616
uses: actions/checkout@v2
1717
with:
1818
submodules: recursive
1919

20-
- name: DiligentCore format validation
21-
shell: bash
22-
run: |
23-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
24-
./validate_format_linux.sh
25-
26-
- name: DiligentTools format validation
27-
shell: bash
28-
run: |
29-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
30-
./validate_format_linux.sh
31-
32-
- name: DiligentFX format validation
33-
shell: bash
34-
run: |
35-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
36-
./validate_format_linux.sh
37-
38-
- name: DiligentSamples format validation
39-
shell: bash
40-
run: |
41-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
42-
./validate_format_linux.sh
43-
4420
- name: Configure dependencies
4521
if: success()
4622
run: |
@@ -55,7 +31,7 @@ jobs:
5531
run: |
5632
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/Scripts/github_actions
5733
chmod +x configure_cmake.sh
58-
./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }}
34+
./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }} "-DDILIGENT_BUILD_TESTS=ON"
5935
6036
- name: Build
6137
if: success()
@@ -75,38 +51,14 @@ jobs:
7551
config: [Debug, Release]
7652

7753
runs-on: ubuntu-latest
78-
name: Linux x64, Clang 10, ${{ matrix.config }}
54+
name: Linux -> x64, Clang 10, ${{ matrix.config }}
7955

8056
steps:
8157
- name: Clone repository
8258
uses: actions/checkout@v2
8359
with:
8460
submodules: recursive
8561

86-
- name: DiligentCore format validation
87-
shell: bash
88-
run: |
89-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
90-
./validate_format_linux.sh
91-
92-
- name: DiligentTools format validation
93-
shell: bash
94-
run: |
95-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
96-
./validate_format_linux.sh
97-
98-
- name: DiligentFX format validation
99-
shell: bash
100-
run: |
101-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
102-
./validate_format_linux.sh
103-
104-
- name: DiligentSamples format validation
105-
shell: bash
106-
run: |
107-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
108-
./validate_format_linux.sh
109-
11062
- name: Configure dependencies
11163
if: success()
11264
run: |
@@ -121,7 +73,7 @@ jobs:
12173
run: |
12274
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/Scripts/github_actions
12375
chmod +x configure_cmake.sh
124-
./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }}
76+
./configure_cmake.sh "linux" "${{runner.workspace}}" ${{ matrix.config }} "-DDILIGENT_BUILD_TESTS=ON"
12577
12678
- name: Build
12779
if: success()

‎.github/workflows/macos.yml‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,14 @@ jobs:
99
config: [Debug, Release]
1010

1111
runs-on: macos-latest
12-
name: MacOS, ${{ matrix.config }}
12+
name: MacOS -> ${{ matrix.config }}
1313

1414
steps:
1515
- name: Clone repository
1616
uses: actions/checkout@v2
1717
with:
1818
submodules: recursive
1919

20-
- name: DiligentCore format validation
21-
shell: bash
22-
run: |
23-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
24-
./validate_format_mac.sh
25-
26-
- name: DiligentTools format validation
27-
shell: bash
28-
run: |
29-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
30-
./validate_format_mac.sh
31-
32-
- name: DiligentFX format validation
33-
shell: bash
34-
run: |
35-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
36-
./validate_format_mac.sh
37-
38-
- name: DiligentSamples format validation
39-
shell: bash
40-
run: |
41-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
42-
./validate_format_mac.sh
43-
4420
- name: Download Vulkan SDK
4521
if: success()
4622
shell: bash
@@ -55,7 +31,7 @@ jobs:
5531
run: |
5632
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/Scripts/github_actions
5733
chmod +x configure_cmake.sh
58-
./configure_cmake.sh "macos" "${{runner.workspace}}" ${{ matrix.config }}
34+
./configure_cmake.sh "macos" "${{runner.workspace}}" ${{ matrix.config }} "-DDILIGENT_BUILD_TESTS=ON"
5935
6036
- name: Build
6137
if: success()

‎.github/workflows/pre_checks.yml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
name: Pre-checks
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
run-win10:
7+
8+
runs-on: windows-latest
9+
name: Win10 -> Pre-checks
10+
11+
steps:
12+
- name: Clone repository
13+
uses: actions/checkout@v2
14+
with:
15+
submodules: recursive
16+
17+
- name: DiligentCore format validation
18+
shell: cmd
19+
run: |
20+
cd "%GITHUB_WORKSPACE%\DiligentCore\BuildTools\FormatValidation"
21+
validate_format_win.bat
22+
23+
- name: DiligentTools format validation
24+
shell: cmd
25+
run: |
26+
cd "%GITHUB_WORKSPACE%\DiligentTools\BuildTools\FormatValidation"
27+
validate_format_win.bat
28+
29+
- name: DiligentFX format validation
30+
shell: cmd
31+
run: |
32+
cd "%GITHUB_WORKSPACE%\DiligentFX\BuildTools\FormatValidation"
33+
validate_format_win.bat
34+
35+
- name: DiligentSamples format validation
36+
shell: cmd
37+
run: |
38+
cd "%GITHUB_WORKSPACE%\DiligentSamples\BuildTools\FormatValidation"
39+
validate_format_win.bat
40+
41+
run-linux:
42+
43+
runs-on: ubuntu-latest
44+
name: Linux -> Pre-checks
45+
46+
steps:
47+
- name: Clone repository
48+
uses: actions/checkout@v2
49+
with:
50+
submodules: recursive
51+
52+
- name: DiligentCore format validation
53+
shell: bash
54+
run: |
55+
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
56+
./validate_format_linux.sh
57+
58+
- name: DiligentTools format validation
59+
shell: bash
60+
run: |
61+
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
62+
./validate_format_linux.sh
63+
64+
- name: DiligentFX format validation
65+
shell: bash
66+
run: |
67+
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
68+
./validate_format_linux.sh
69+
70+
- name: DiligentSamples format validation
71+
shell: bash
72+
run: |
73+
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
74+
./validate_format_linux.sh
75+
76+
run-macos:
77+
78+
runs-on: macos-latest
79+
name: MacOS -> Pre-Checks
80+
81+
steps:
82+
- name: Clone repository
83+
uses: actions/checkout@v2
84+
with:
85+
submodules: recursive
86+
87+
- name: DiligentCore format validation
88+
shell: bash
89+
run: |
90+
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
91+
./validate_format_mac.sh
92+
93+
- name: DiligentTools format validation
94+
shell: bash
95+
run: |
96+
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
97+
./validate_format_mac.sh
98+
99+
- name: DiligentFX format validation
100+
shell: bash
101+
run: |
102+
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
103+
./validate_format_mac.sh
104+
105+
- name: DiligentSamples format validation
106+
shell: bash
107+
run: |
108+
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
109+
./validate_format_mac.sh

‎.github/workflows/tvos.yml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,14 @@ jobs:
99
config: [Release]
1010

1111
runs-on: macos-latest
12-
name: tvOS, ${{ matrix.config }}
12+
name: MacOS -> tvOS, ${{ matrix.config }}
1313

1414
steps:
1515
- name: Clone repository
1616
uses: actions/checkout@v2
1717
with:
1818
submodules: recursive
1919

20-
- name: DiligentCore format validation
21-
shell: bash
22-
run: |
23-
cd $GITHUB_WORKSPACE/DiligentCore/BuildTools/FormatValidation
24-
./validate_format_mac.sh
25-
26-
- name: DiligentTools format validation
27-
shell: bash
28-
run: |
29-
cd $GITHUB_WORKSPACE/DiligentTools/BuildTools/FormatValidation
30-
./validate_format_mac.sh
31-
32-
- name: DiligentFX format validation
33-
shell: bash
34-
run: |
35-
cd $GITHUB_WORKSPACE/DiligentFX/BuildTools/FormatValidation
36-
./validate_format_mac.sh
37-
38-
- name: DiligentSamples format validation
39-
shell: bash
40-
run: |
41-
cd $GITHUB_WORKSPACE/DiligentSamples/BuildTools/FormatValidation
42-
./validate_format_mac.sh
43-
4420
- name: Download Vulkan SDK
4521
if: success()
4622
shell: bash

0 commit comments

Comments
 (0)