Skip to content

Commit 869d6ee

Browse files
TheMostDiligentTheMostDiligent
committed
CI: bump Diligent GitHub Action to v11
Switch to emscripten-core/setup-emsdk for Emscripten setup
1 parent 296ca9a commit 869d6ee

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎.github/workflows/build-android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Set up build environment
2727
if: success()
28-
uses: DiligentGraphics/github-action/setup-build-env@v10
28+
uses: DiligentGraphics/github-action/setup-build-env@v11
2929
with:
3030
platform: Android
3131

‎.github/workflows/build-apple.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Set up build environment
5959
if: success()
60-
uses: DiligentGraphics/github-action/setup-build-env@v10
60+
uses: DiligentGraphics/github-action/setup-build-env@v11
6161
with:
6262
platform: ${{ matrix.platform }}
6363

@@ -71,20 +71,20 @@ jobs:
7171
7272
- name: Configure CMake
7373
if: success()
74-
uses: DiligentGraphics/github-action/configure-cmake@v10
74+
uses: DiligentGraphics/github-action/configure-cmake@v11
7575
with:
7676
build-type: ${{ matrix.build_type }}
7777
cmake-args: ${{ matrix.cmake_args }}
7878

7979
- name: Build
8080
if: success()
81-
uses: DiligentGraphics/github-action/build@v10
81+
uses: DiligentGraphics/github-action/build@v11
8282
with:
8383
target: install
8484

8585
- name: DiligentCoreTest
8686
if: ${{ success() && matrix.platform == 'MacOS' }}
87-
uses: DiligentGraphics/github-action/run-core-tests@v10
87+
uses: DiligentGraphics/github-action/run-core-tests@v11
8888

8989
- name: Upload artifact
9090
uses: actions/upload-artifact@v4

‎.github/workflows/build-emscripten.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ jobs:
3838

3939
- name: Set up build environment
4040
if: success()
41-
uses: DiligentGraphics/github-action/setup-build-env@v10
41+
uses: DiligentGraphics/github-action/setup-build-env@v11
4242
with:
4343
platform: Web
4444

4545
- name: Configure CMake
4646
if: success()
47-
uses: DiligentGraphics/github-action/configure-cmake@v10
47+
uses: DiligentGraphics/github-action/configure-cmake@v11
4848
with:
4949
build-type: ${{ matrix.build_type }}
5050
cmake-args: ${{ matrix.cmake_args }}
5151

5252
- name: Build
5353
if: success()
54-
uses: DiligentGraphics/github-action/build@v10
54+
uses: DiligentGraphics/github-action/build@v11

‎.github/workflows/build-linux.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Set up build environment
8787
if: success()
88-
uses: DiligentGraphics/github-action/setup-build-env@v10
88+
uses: DiligentGraphics/github-action/setup-build-env@v11
8989
with:
9090
platform: Linux
9191
cmake-generator: ${{ matrix.cmake_generator }}
@@ -100,7 +100,7 @@ jobs:
100100
101101
- name: Configure CMake
102102
if: success()
103-
uses: DiligentGraphics/github-action/configure-cmake@v10
103+
uses: DiligentGraphics/github-action/configure-cmake@v11
104104
with:
105105
cc: ${{ matrix.cc }}
106106
cxx: ${{ matrix.cxx }}
@@ -112,38 +112,38 @@ jobs:
112112
- name: Build
113113
id: build
114114
if: success()
115-
uses: DiligentGraphics/github-action/build@v10
115+
uses: DiligentGraphics/github-action/build@v11
116116
with:
117117
target: install
118118

119119
- name: DiligentCoreTest
120120
if: success()
121-
uses: DiligentGraphics/github-action/run-core-tests@v10
121+
uses: DiligentGraphics/github-action/run-core-tests@v11
122122

123123
- name: DiligentCoreAPITest VK
124124
# NB: it is essential to include failure() to override the default status check of success()
125125
# that is automatically applied to if conditions that don't contain a status check function.
126126
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
127-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
127+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
128128
with:
129129
mode: vk_sw
130130

131131
- name: DiligentCoreAPITest VK Compatibility
132132
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
133-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
133+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
134134
with:
135135
mode: vk_sw
136136
vk-compatibility: true
137137

138138
- name: DiligentCoreAPITest GL
139139
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
140-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
140+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
141141
with:
142142
mode: gl
143143

144144
- name: DiligentCoreAPITest GL with Non-Separable Programs
145145
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
146-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
146+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
147147
with:
148148
mode: gl
149149
non-separable-progs: true

‎.github/workflows/build-windows.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
- name: Set up build environment
7979
if: success()
80-
uses: DiligentGraphics/github-action/setup-build-env@v10
80+
uses: DiligentGraphics/github-action/setup-build-env@v11
8181
with:
8282
platform: ${{ matrix.platform }}
8383
cmake-generator: ${{ matrix.cmake_generator }}
@@ -93,7 +93,7 @@ jobs:
9393
9494
- name: Configure CMake
9595
if: success()
96-
uses: DiligentGraphics/github-action/configure-cmake@v10
96+
uses: DiligentGraphics/github-action/configure-cmake@v11
9797
with:
9898
generator: ${{ matrix.cmake_generator }}
9999
vs-arch: ${{ matrix.toolset }}
@@ -103,31 +103,31 @@ jobs:
103103
- name: Build
104104
id: build
105105
if: success()
106-
uses: DiligentGraphics/github-action/build@v10
106+
uses: DiligentGraphics/github-action/build@v11
107107
with:
108108
target: install
109109

110110
- name: DiligentCoreTest
111111
if: ${{ success() && matrix.name != 'UWP'}}
112-
uses: DiligentGraphics/github-action/run-core-tests@v10
112+
uses: DiligentGraphics/github-action/run-core-tests@v11
113113

114114
- name: DiligentCoreAPITest D3D11
115115
# NB: it is essential to include failure() to override the default status check of success()
116116
# that is automatically applied to if conditions that don't contain a status check function.
117117
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Win10' || matrix.name == 'Win10-Ninja') }}
118-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
118+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
119119
with:
120120
mode: d3d11_sw
121121

122122
- name: DiligentCoreAPITest D3D12
123123
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Win10' || matrix.name == 'Win10-Ninja') }}
124-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
124+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
125125
with:
126126
mode: d3d12_sw
127127

128128
- name: DiligentCoreAPITest D3D12 DXC
129129
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Win10' || matrix.name == 'Win10-Ninja') }}
130-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
130+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
131131
with:
132132
mode: d3d12_sw
133133
use-dxc: true
@@ -136,7 +136,7 @@ jobs:
136136

137137
- name: DiligentCoreAPITest WebGPU
138138
if: ${{ (success() || failure() && steps.build.outcome == 'success') && matrix.name == 'Win10' }}
139-
uses: DiligentGraphics/github-action/run-core-gpu-tests@v10
139+
uses: DiligentGraphics/github-action/run-core-gpu-tests@v11
140140
with:
141141
mode: wgpu
142142

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141

4242
- name: Set up build environment
4343
if: success()
44-
uses: DiligentGraphics/github-action/setup-build-env@v10
44+
uses: DiligentGraphics/github-action/setup-build-env@v11
4545
with:
4646
platform: ${{ matrix.platform }}
4747
cmake-generator: ${{ matrix.cmake_generator }}
4848

4949
- name: Configure CMake
5050
if: success()
51-
uses: DiligentGraphics/github-action/configure-cmake@v10
51+
uses: DiligentGraphics/github-action/configure-cmake@v11
5252
with:
5353
cc: ${{ matrix.cc }}
5454
cxx: ${{ matrix.cxx }}
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Build
6767
if: success()
68-
uses: DiligentGraphics/github-action/build@v10
68+
uses: DiligentGraphics/github-action/build@v11
6969

7070
- name: Perform CodeQL Analysis
7171
uses: github/codeql-action/analyze@v3

‎.github/workflows/msvc_analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232

3333
- name: Set up build environment
3434
if: success()
35-
uses: DiligentGraphics/github-action/setup-build-env@v10
35+
uses: DiligentGraphics/github-action/setup-build-env@v11
3636
with:
3737
platform: ${{ matrix.platform }}
3838
cmake-generator: ${{ matrix.cmake_generator }}
3939

4040
- name: Configure CMake
4141
if: success()
42-
uses: DiligentGraphics/github-action/configure-cmake@v10
42+
uses: DiligentGraphics/github-action/configure-cmake@v11
4343
with:
4444
generator: ${{ matrix.cmake_generator }}
4545
vs-arch: ${{ matrix.toolset }}
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Build
5050
if: success()
51-
uses: DiligentGraphics/github-action/build@v10
51+
uses: DiligentGraphics/github-action/build@v11
5252

5353
- name: Run MSVC Code Analysis
5454
uses: microsoft/msvc-code-analysis-action@v0.1.1

0 commit comments

Comments
 (0)