Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit c26aba1

Browse files
pjanottilachmatt
andauthored
Fix CI (#748)
* Suppress NU1902 and NU1903 for .NET Core 2.1 * Update SHA256 for dotnet-install.sh * Run Windows integration tests on 2019 runner * Revert "Run Windows integration tests on 2019 runner" This reverts commit 8a298df. * Always install net461 targeting pack * Suppress NU1902 and NU1903 for test-applications * Suppress checking for TFM end-of-life * Suppress NU1902 and NU1903 for dependency-libs * Ignore vulnerability in log4net used in test app * Nuke upgrade * Fix nuke parameters.json sln path * Handle project not found * Update top dotnet SDK to 8.0.100 * Fix indentation * Update Alpine version to one that has .NET 8.0 docker image * Fix match of project names * Fix AbsolutePath comparison in CompileSamplesLinux * Add aspnetcore 7 to Alpine docker image * Go back to older Alpine docker image * Keep build at net7.0 * Docker builds back to 7.0.101 * update curl version in debian.dockerfile --------- Co-authored-by: Mateusz Lach <[email protected]>
1 parent 8ab1f5d commit c26aba1

28 files changed

+758
-95
lines changed

.config/dotnet-tools.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"nuke.globaltool": {
6+
"version": "7.0.6",
7+
"commands": [
8+
"nuke"
9+
]
10+
}
11+
}
12+
}

.github/workflows/ci.yml

+19-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ jobs:
8080
5.0.408
8181
6.0.404
8282
7.0.101
83+
8.0.100
84+
8385
- name: Install CMake 3.19.8
8486
if: ${{ runner.os == 'Linux' }}
8587
run: curl -sL https://cmake.org/files/v3.19/cmake-3.19.8-Linux-x86_64.sh -o cmakeinstall.sh && chmod +x cmakeinstall.sh && sudo ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir
@@ -135,6 +137,8 @@ jobs:
135137
3.1.426
136138
6.0.404
137139
7.0.101
140+
8.0.100
141+
138142
- name: Build Docker image
139143
run: |
140144
docker build \
@@ -181,6 +185,8 @@ jobs:
181185
3.1.426
182186
6.0.404
183187
7.0.101
188+
8.0.100
189+
184190
- run: ./tracer/build.cmd Clean BuildTracerHome BuildAndRunManagedUnitTests
185191
- uses: actions/[email protected]
186192
with:
@@ -206,6 +212,8 @@ jobs:
206212
3.1.426
207213
6.0.404
208214
7.0.101
215+
8.0.100
216+
209217
- name: Build Docker image
210218
run: |
211219
docker build \
@@ -252,6 +260,8 @@ jobs:
252260
3.1.426
253261
6.0.404
254262
7.0.101
263+
8.0.100
264+
255265
- name: Install CMake 3.19.8
256266
if: ${{ runner.os == 'Linux' }}
257267
run: curl -sL https://cmake.org/files/v3.19/cmake-3.19.8-Linux-x86_64.sh -o cmakeinstall.sh && chmod +x cmakeinstall.sh && sudo ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir
@@ -277,6 +287,8 @@ jobs:
277287
3.1.426
278288
6.0.404
279289
7.0.101
290+
8.0.100
291+
280292
- name: Build Docker image
281293
run: |
282294
docker build \
@@ -326,6 +338,8 @@ jobs:
326338
3.1.426
327339
6.0.404
328340
7.0.101
341+
8.0.100
342+
329343
# Cosmos is _way_ to flaky at the moment. Try enabling again at a later time
330344
# - name: Start CosmosDB Emulator
331345
# if: ${{ matrix.target == 'BuildAndRunWindowsIntegrationTests' }}
@@ -336,7 +350,6 @@ jobs:
336350
# Start-CosmosDbEmulator -Timeout 300
337351
# Workaround around long name being hit in MultiDomainHostTests.WorksOutsideTheGAC tests
338352
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
339-
if: ${{ matrix.target == 'BuildAndRunWindowsRegressionTests' }}
340353
run: |
341354
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
342355
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
@@ -385,6 +398,7 @@ jobs:
385398
3.1.426
386399
6.0.404
387400
7.0.101
401+
8.0.100
388402
389403
- name: Remove large node images
390404
run: docker rmi node:20 node:18 node:16
@@ -459,6 +473,8 @@ jobs:
459473
3.1.426
460474
6.0.404
461475
7.0.101
476+
8.0.100
477+
462478
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
463479
run: |
464480
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
@@ -508,6 +524,8 @@ jobs:
508524
3.1.426
509525
6.0.404
510526
7.0.101
527+
8.0.100
528+
511529
- name: install Microsoft.Net.Component.4.6.1.TargetingPack
512530
run: |
513531
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"

.github/workflows/release-draft.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 30
1616
env:
1717
baseImage: ${{ matrix.baseImage }}
18-
dotnetSdkVersion: 7.0.101
18+
dotnetSdkVersion: 8.0.100
1919
steps:
2020
- uses: actions/[email protected]
2121
- name: Build Docker image
@@ -56,6 +56,8 @@ jobs:
5656
5.0.408
5757
6.0.404
5858
7.0.101
59+
8.0.100
60+
5961
- run: tracer\build.cmd Clean BuildTracerHome PackageTracerHome
6062
shell: cmd
6163
- name: Upload Windows MSI

.github/workflows/verify_source_generated_changes_are_persisted.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- uses: actions/[email protected]
1919
with:
20-
dotnet-version: '7.0.101'
20+
dotnet-version: '8.0.100'
2121

2222
- name: "Removing existing generated files"
2323
run: Get-ChildItem –Path ".\tracer\src\Datadog.Trace\Generated" -Recurse -File | Remove-Item

.nuke

Whitespace-only changes.

0 commit comments

Comments
 (0)