Skip to content

Commit c930243

Browse files
authored
Merge branch 'master' into user/dmachaj/no-loadlibrary
2 parents b9d7ec5 + 34fba98 commit c930243

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
config: Release
2424
runs-on: windows-latest
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727

2828
- name: Download nuget
2929
run: |
@@ -102,18 +102,18 @@ jobs:
102102
config: Release
103103
runs-on: windows-latest
104104
steps:
105-
- uses: actions/checkout@v4
105+
- uses: actions/checkout@v5
106106

107107
- name: Fetch cppwinrt executables
108108
if: matrix.arch != 'arm64'
109-
uses: actions/download-artifact@v4
109+
uses: actions/download-artifact@v5
110110
with:
111111
name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
112112
path: _build/${{ matrix.arch }}/${{ matrix.config }}/
113113

114114
- name: Fetch x86 cppwinrt executables (arm64 only)
115115
if: matrix.arch == 'arm64'
116-
uses: actions/download-artifact@v4
116+
uses: actions/download-artifact@v5
117117
with:
118118
name: msvc-build-${{ matrix.compiler}}-x86-Release-bin
119119
path: _build/x86/Release/
@@ -250,7 +250,7 @@ jobs:
250250
CMAKE_COLOR_DIAGNOSTICS: 1
251251
CLICOLOR_FORCE: 1
252252
steps:
253-
- uses: actions/checkout@v4
253+
- uses: actions/checkout@v5
254254

255255
- name: Install cross compiler
256256
run: |
@@ -283,7 +283,7 @@ jobs:
283283
Deployment: [Component, Standalone]
284284
runs-on: windows-latest
285285
steps:
286-
- uses: actions/checkout@v4
286+
- uses: actions/checkout@v5
287287

288288
- name: Download nuget
289289
run: |
@@ -323,10 +323,10 @@ jobs:
323323
config: [Release]
324324
runs-on: windows-latest
325325
steps:
326-
- uses: actions/checkout@v4
326+
- uses: actions/checkout@v5
327327

328328
- name: Fetch cppwinrt executables
329-
uses: actions/download-artifact@v4
329+
uses: actions/download-artifact@v5
330330
with:
331331
name: msvc-build-${{ matrix.compiler}}-${{ matrix.arch }}-${{ matrix.config }}-bin
332332
path: _build/${{ matrix.arch }}/${{ matrix.config }}/
@@ -368,7 +368,7 @@ jobs:
368368
name: Build nuget package with MSVC
369369
runs-on: windows-latest
370370
steps:
371-
- uses: actions/checkout@v4
371+
- uses: actions/checkout@v5
372372

373373
- name: Package
374374
run: |

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414

1515
steps:
16-
- uses: actions/stale@v9
16+
- uses: actions/stale@v10
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
days-before-stale: 10

0 commit comments

Comments
 (0)