Skip to content

Commit bf3f2fc

Browse files
TheMostDiligentTheMostDiligent
committed
CI: update GitHub Actions versions
- actions/checkout: v4 -> v6 - actions/upload-artifact: v4 -> v7 - DiligentGraphics/github-action: v12 -> v14 - Remove ninja installation as it is now pre-installed
1 parent 4f1f0ac commit bf3f2fc

5 files changed

Lines changed: 42 additions & 42 deletions

File tree

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99

1010
steps:
1111
- name: Clone DiligentCore
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1313
with:
1414
repository: DiligentGraphics/DiligentCore
1515
path: DiligentCore
1616

1717
- name: Clone DiligentTools
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
path: DiligentTools
2121

@@ -59,37 +59,37 @@ jobs:
5959

6060
steps:
6161
- name: Checkout
62-
uses: DiligentGraphics/github-action/checkout@v12
62+
uses: DiligentGraphics/github-action/checkout@v14
6363

6464
- name: Set up build environment
6565
if: success()
66-
uses: DiligentGraphics/github-action/setup-build-env@v12
66+
uses: DiligentGraphics/github-action/setup-build-env@v14
6767
with:
6868
platform: ${{ matrix.platform }}
6969

7070
- name: Configure CMake
7171
if: success()
72-
uses: DiligentGraphics/github-action/configure-cmake@v12
72+
uses: DiligentGraphics/github-action/configure-cmake@v14
7373
with:
7474
build-type: ${{ matrix.build_type }}
7575
cmake-args: ${{ matrix.cmake_args }}
7676

7777
- name: Build
7878
if: success()
79-
uses: DiligentGraphics/github-action/build@v12
79+
uses: DiligentGraphics/github-action/build@v14
8080
with:
8181
target: install
8282

8383
- name: DiligentToolsTest
8484
if: ${{ success() && matrix.platform == 'MacOS' }}
85-
uses: DiligentGraphics/github-action/run-tools-tests@v12
85+
uses: DiligentGraphics/github-action/run-tools-tests@v14
8686

8787
- name: HLSL2GLSLConverterTest
8888
if: ${{ success() && matrix.platform == 'MacOS' }}
89-
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v12
89+
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v14
9090

9191
- name: Upload artifact
92-
uses: actions/upload-artifact@v4
92+
uses: actions/upload-artifact@v7
9393
if: ${{ success() && matrix.build_type == 'Release' && matrix.platform == 'MacOS' }}
9494
with:
9595
name: DiligentTools-${{ matrix.platform }}-${{ matrix.build_type }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: DiligentGraphics/github-action/checkout@v12
32+
uses: DiligentGraphics/github-action/checkout@v14
3333

3434
- name: Set up build environment
3535
if: success()
36-
uses: DiligentGraphics/github-action/setup-build-env@v12
36+
uses: DiligentGraphics/github-action/setup-build-env@v14
3737
with:
3838
platform: Web
3939

4040
- name: Configure CMake
4141
if: success()
42-
uses: DiligentGraphics/github-action/configure-cmake@v12
42+
uses: DiligentGraphics/github-action/configure-cmake@v14
4343
with:
4444
build-type: ${{ matrix.build_type }}
4545
cmake-args: "-DDILIGENT_BUILD_TOOLS_INCLUDE_TEST=ON"
4646

4747
- name: Build
4848
if: success()
49-
uses: DiligentGraphics/github-action/build@v12
49+
uses: DiligentGraphics/github-action/build@v14

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99

1010
steps:
1111
- name: Clone DiligentCore
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1313
with:
1414
repository: DiligentGraphics/DiligentCore
1515
path: DiligentCore
1616

1717
- name: Clone DiligentTools
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
path: DiligentTools
2121

@@ -58,18 +58,18 @@ jobs:
5858

5959
steps:
6060
- name: Checkout
61-
uses: DiligentGraphics/github-action/checkout@v12
61+
uses: DiligentGraphics/github-action/checkout@v14
6262

6363
- name: Set up build environment
6464
if: success()
65-
uses: DiligentGraphics/github-action/setup-build-env@v12
65+
uses: DiligentGraphics/github-action/setup-build-env@v14
6666
with:
6767
platform: Linux
6868
cmake-generator: ${{ matrix.cmake_generator }}
6969

7070
- name: Configure CMake
7171
if: success()
72-
uses: DiligentGraphics/github-action/configure-cmake@v12
72+
uses: DiligentGraphics/github-action/configure-cmake@v14
7373
with:
7474
cc: ${{ matrix.cc }}
7575
cxx: ${{ matrix.cxx }}
@@ -80,34 +80,34 @@ jobs:
8080
- name: Build
8181
id: build
8282
if: success()
83-
uses: DiligentGraphics/github-action/build@v12
83+
uses: DiligentGraphics/github-action/build@v14
8484
with:
8585
target: install
8686

8787
- name: DiligentToolsTest
8888
if: success()
89-
uses: DiligentGraphics/github-action/run-tools-tests@v12
89+
uses: DiligentGraphics/github-action/run-tools-tests@v14
9090

9191
- name: DiligentToolsGPUTest VK
9292
# NB: it is essential to include failure() to override the default status check of success()
9393
# that is automatically applied to if conditions that don't contain a status check function.
9494
if: ${{ success() || failure() && steps.build.outcome == 'success' }}
95-
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v12
95+
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v14
9696
with:
9797
mode: vk_sw
9898

9999
- name: DiligentToolsGPUTest GL
100100
if: ${{ success() || failure() && steps.build.outcome == 'success' }}
101-
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v12
101+
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v14
102102
with:
103103
mode: gl
104104

105105
- name: HLSL2GLSLConverterTest
106106
if: ${{ success() || failure() && steps.build.outcome == 'success' }}
107-
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v12
107+
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v14
108108

109109
- name: Upload artifact
110-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v7
111111
if: ${{ success() && matrix.build_type != 'Debug' }}
112112
with:
113113
name: DiligentTools-Linux-${{ matrix.name }}-x64-${{ matrix.build_type }}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99

1010
steps:
1111
- name: Clone DiligentCore
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1313
with:
1414
repository: DiligentGraphics/DiligentCore
1515
path: DiligentCore
1616

1717
- name: Clone DiligentTools
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
path: DiligentTools
2121

@@ -79,19 +79,19 @@ jobs:
7979

8080
steps:
8181
- name: Checkout
82-
uses: DiligentGraphics/github-action/checkout@v12
82+
uses: DiligentGraphics/github-action/checkout@v14
8383

8484
- name: Set up build environment
8585
if: success()
86-
uses: DiligentGraphics/github-action/setup-build-env@v12
86+
uses: DiligentGraphics/github-action/setup-build-env@v14
8787
with:
8888
platform: ${{ matrix.platform }}
8989
cmake-generator: ${{ matrix.cmake_generator }}
9090
ninja-vs-arch: ${{ matrix.toolset }}
9191

9292
- name: Configure CMake
9393
if: success()
94-
uses: DiligentGraphics/github-action/configure-cmake@v12
94+
uses: DiligentGraphics/github-action/configure-cmake@v14
9595
with:
9696
generator: ${{ matrix.cmake_generator }}
9797
vs-arch: ${{ matrix.toolset }}
@@ -101,40 +101,40 @@ jobs:
101101
- name: Build
102102
id: build
103103
if: success()
104-
uses: DiligentGraphics/github-action/build@v12
104+
uses: DiligentGraphics/github-action/build@v14
105105
with:
106106
target: install
107107

108108
- name: DiligentToolsTest
109109
if: ${{ success() && matrix.name != 'UWP'}}
110-
uses: DiligentGraphics/github-action/run-tools-tests@v12
110+
uses: DiligentGraphics/github-action/run-tools-tests@v14
111111

112112
- name: DiligentToolsGPUTest D3D11
113113
# NB: it is essential to include failure() to override the default status check of success()
114114
# that is automatically applied to if conditions that don't contain a status check function.
115115
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Win10' || matrix.name == 'Win8.1') }}
116-
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v12
116+
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v14
117117
with:
118118
mode: d3d11_sw
119119

120120
- name: DiligentToolsGPUTest D3D12
121121
if: ${{ (success() || failure() && steps.build.outcome == 'success') && matrix.name == 'Win10' }}
122-
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v12
122+
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v14
123123
with:
124124
mode: d3d12_sw
125125

126126
- name: DiligentToolsGPUTest WebGPU
127127
if: ${{ (success() || failure() && steps.build.outcome == 'success') && matrix.name == 'Win10' }}
128-
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v12
128+
uses: DiligentGraphics/github-action/run-tools-gpu-tests@v14
129129
with:
130130
mode: wgpu
131131

132132
- name: HLSL2GLSLConverterTest
133133
if: ${{ (success() || failure() && steps.build.outcome == 'success') && matrix.name != 'UWP'}}
134-
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v12
134+
uses: DiligentGraphics/github-action/run-hlsl2glsl-converter-test@v14
135135

136136
- name: Upload artifact
137-
uses: actions/upload-artifact@v4
137+
uses: actions/upload-artifact@v7
138138
if: ${{ success() && matrix.build_type != 'Debug' && matrix.name == 'Win10' }}
139139
with:
140140
name: DiligentTools-${{ matrix.name }}-${{ matrix.toolset }}-${{ matrix.build_type }}

‎.github/workflows/msvc_analysis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: DiligentGraphics/github-action/checkout@v12
30+
uses: DiligentGraphics/github-action/checkout@v14
3131

3232
- name: Set up build environment
3333
if: success()
34-
uses: DiligentGraphics/github-action/setup-build-env@v12
34+
uses: DiligentGraphics/github-action/setup-build-env@v14
3535
with:
3636
platform: ${{ matrix.platform }}
3737
cmake-generator: ${{ matrix.cmake_generator }}
3838

3939
- name: Configure CMake
4040
if: success()
41-
uses: DiligentGraphics/github-action/configure-cmake@v12
41+
uses: DiligentGraphics/github-action/configure-cmake@v14
4242
with:
4343
generator: ${{ matrix.cmake_generator }}
4444
vs-arch: ${{ matrix.toolset }}
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Build
4949
if: success()
50-
uses: DiligentGraphics/github-action/build@v12
50+
uses: DiligentGraphics/github-action/build@v14
5151

5252
- name: Run MSVC Code Analysis
5353
uses: microsoft/msvc-code-analysis-action@v0.1.1
@@ -63,14 +63,14 @@ jobs:
6363

6464
# Upload SARIF file to GitHub Code Scanning Alerts
6565
- name: Upload SARIF to GitHub
66-
uses: github/codeql-action/upload-sarif@v3
66+
uses: github/codeql-action/upload-sarif@v4
6767
with:
6868
sarif_file: ${{ steps.run-analysis.outputs.sarif }}
6969
checkout_path: ${{ github.workspace }}/DiligentTools
7070

7171
# Upload SARIF file as an Artifact to download and view
7272
- name: Upload SARIF as an Artifact
73-
uses: actions/upload-artifact@v4
73+
uses: actions/upload-artifact@v7
7474
with:
7575
name: sarif-file
7676
path: ${{ steps.run-analysis.outputs.sarif }}

0 commit comments

Comments
 (0)