Skip to content

Commit 93f4f53

Browse files
authored
Merge branch 'master' into renovate/mocha-11.x
2 parents e6e002f + 6b34abe commit 93f4f53

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/ci.yml

+15-7
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@ jobs:
9191
restore-keys: |
9292
${{ runner.os }}-nuget-
9393
- name: 🔨 Use .NET Core 3.1 SDK
94-
uses: actions/setup-dotnet@v4.2.0
94+
uses: actions/setup-dotnet@v4.3.0
9595
with:
9696
dotnet-version: '3.1.x'
9797
- name: 🔨 Use .NET Core 6.0 SDK
98-
uses: actions/setup-dotnet@v4.2.0
98+
uses: actions/setup-dotnet@v4.3.0
9999
with:
100100
dotnet-version: '6.0.x'
101101
- name: 🔨 Use .NET Core 8.0 SDK
102-
uses: actions/setup-dotnet@v4.2.0
102+
uses: actions/setup-dotnet@v4.3.0
103103
with:
104104
dotnet-version: '8.0.x'
105105
- name: 🔨 Use .NET Core 9.0 SDK
106-
uses: actions/setup-dotnet@v4.2.0
106+
uses: actions/setup-dotnet@v4.3.0
107107
with:
108108
dotnet-version: '9.0.x'
109109
- name: 🎁 dotnet tool restore
@@ -168,10 +168,18 @@ jobs:
168168
with:
169169
name: 'docs-${{ matrix.os }}'
170170
path: 'artifacts/docs/'
171+
Merge:
172+
runs-on: ubuntu-latest
173+
needs: build
174+
steps:
175+
- name: Merge Artifacts
176+
uses: actions/upload-artifact/merge@v4
177+
with:
178+
name: nuget
179+
pattern: nuget-*
171180
Publish:
172-
needs:
173-
- Build
174-
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
181+
needs: Merge
182+
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
175183
secrets:
176184
RSG_NUGET_API_KEY: '${{ secrets.RSG_NUGET_API_KEY }}'
177185
RSG_AZURE_DEVOPS: '${{ secrets.RSG_AZURE_DEVOPS }}'

vscode-testextension/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)