Skip to content

Commit 91ff768

Browse files
committed
Bump to Ubuntu 22.04
1 parent af6d90a commit 91ff768

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

.github/workflows/build-nuget-packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
- name: Download Ubuntu x64 Artifacts from build job
5151
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8
5252
with:
53-
name: bin-ubuntu-20.04
54-
path: bin/ci-artifacts/bin-ubuntu-20.04
53+
name: bin-ubuntu-22.04
54+
path: bin/ci-artifacts/bin-ubuntu-22.04
5555

5656
- name: Download Ubuntu arm64 Artifacts from build job
5757
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
include:
1616
- machine: windows-2022
1717
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
18-
- machine: ubuntu-20.04
18+
- machine: ubuntu-22.04
1919
log-dir: "/var/log/opentelemetry/dotnet"
2020
- machine: macos-13
2121
log-dir: "/var/log/opentelemetry/dotnet"
@@ -77,14 +77,14 @@ jobs:
7777
run: ./build.cmd BuildWorkflow --no-restore ${{ steps.nuget-cache.outputs.cache-hit != 'true' }}
7878

7979
- name: Download native Ubuntu 16.04 Artifacts from build job
80-
if: ${{ matrix.machine == 'ubuntu-20.04' }}
80+
if: ${{ matrix.machine == 'ubuntu-22.04' }}
8181
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8
8282
with:
8383
name: bin-ubuntu1604-native
8484
path: bin/ci-artifacts/bin-ubuntu1604-native
8585

8686
- name: Replace Ubuntu native code by Ubuntu 16.04 artifacts
87-
if: ${{ matrix.machine == 'ubuntu-20.04' }}
87+
if: ${{ matrix.machine == 'ubuntu-22.04' }}
8888
run: |
8989
rm ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
9090
cp ./bin/ci-artifacts/bin-ubuntu1604-native/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
test-tfm: [ net9.0, net8.0, net462 ]
35-
machine: [ windows-2022, ubuntu-20.04, macos-13, otel-linux-arm64 ]
35+
machine: [ windows-2022, ubuntu-22.04, macos-13, otel-linux-arm64 ]
3636
exclude:
3737
- test-tfm: net462
3838
machine: macos-13
3939
- test-tfm: net462
40-
machine: ubuntu-20.04
40+
machine: ubuntu-22.04
4141
- test-tfm: net462
4242
machine: otel-linux-arm64
4343
include:
4444
- machine: windows-2022
4545
containers: none
46-
- machine: ubuntu-20.04
46+
- machine: ubuntu-22.04
4747
containers: linux
4848
- machine: macos-13
4949
containers: none
@@ -204,17 +204,17 @@ jobs:
204204
fail-fast: false
205205
matrix:
206206
include:
207-
- machine: ubuntu-20.04
207+
- machine: ubuntu-22.04
208208
base-image: alpine
209209
build-source: alpine-x64
210210
os-type: linux-musl
211-
- machine: ubuntu-20.04
211+
- machine: ubuntu-22.04
212212
base-image: debian
213-
build-source: ubuntu-20.04
213+
build-source: ubuntu-22.04
214214
os-type: linux-glibc
215-
- machine: ubuntu-20.04
215+
- machine: ubuntu-22.04
216216
base-image: centos-stream9
217-
build-source: ubuntu-20.04
217+
build-source: ubuntu-22.04
218218
os-type: linux-glibc
219219
- machine: otel-linux-arm64
220220
base-image: alpine
@@ -252,7 +252,7 @@ jobs:
252252
fail-fast: false
253253
matrix:
254254
include:
255-
- machine: ubuntu-20.04
255+
- machine: ubuntu-22.04
256256
- machine: macos-13
257257
- machine: windows-2022
258258
- machine: otel-linux-arm64
@@ -300,7 +300,7 @@ jobs:
300300
path: test-artifacts/
301301

302302
test-jobs:
303-
runs-on: ubuntu-20.04
303+
runs-on: ubuntu-22.04
304304
needs:
305305
- test-build-managed
306306
- test-build-native

.github/workflows/release-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
include:
5050
- machine: windows-2022
5151
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
52-
- machine: ubuntu-20.04
52+
- machine: ubuntu-22.04
5353
log-dir: "/var/log/opentelemetry/dotnet"
5454
- machine: macos-13
5555
log-dir: "/var/log/opentelemetry/dotnet"
@@ -99,7 +99,7 @@ jobs:
9999
fail-fast: false
100100
matrix:
101101
include:
102-
- machine: ubuntu-20.04
102+
- machine: ubuntu-22.04
103103
base-image: alpine
104104
net-version: net9.0
105105
- machine: otel-linux-arm64

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
create-release:
2828
name: Create GH release
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
needs: [ build, build-container, build-nuget-packages ]
3131
permissions:
3232
contents: write
@@ -46,7 +46,7 @@ jobs:
4646

4747
- run: cd bin-alpine-x64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-musl-x64.zip . * ; cd ..
4848
- run: cd bin-alpine-arm64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-musl-arm64.zip . * ; cd ..
49-
- run: cd bin-ubuntu-20.04 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip . * ; cd ..
49+
- run: cd bin-ubuntu-22.04 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip . * ; cd ..
5050
- run: cd bin-otel-linux-arm64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-arm64.zip . * ; cd ..
5151
- run: cd bin-windows-2022 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-windows.zip . * ; cd ..
5252
- run: cd bin-macos-13 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-macos.zip . * ; cd ..

.github/workflows/verify-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
include:
2121
- machine: windows-2022
2222
containers: windows
23-
- machine: ubuntu-20.04
23+
- machine: ubuntu-22.04
2424
containers: linux
2525
- machine: macos-13
2626
containers: none

build/Build.NuGet.Steps.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ partial class Build
5151
{
5252
"bin-alpine-x64/linux-musl-x64",
5353
"bin-alpine-arm64/linux-musl-arm64",
54-
"bin-ubuntu-20.04/linux-x64",
54+
"bin-ubuntu-22.04/linux-x64",
5555
"bin-otel-linux-arm64/linux-arm64",
5656
"bin-macos-13/osx-x64",
5757
"bin-windows-2022/win-x64",

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ CI tests run against the following operating systems:
104104
- [CentOS Stream 9 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-stream9.dockerfile)
105105
- [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md)
106106
- [Microsoft Windows Server 2022 x64](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md)
107-
- [Ubuntu 20.04 LTS x64](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md)
107+
- [Ubuntu 22.04 LTS x64](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md)
108108
- Ubuntu 22.04 LTS ARM64
109109

110110
### Instrumented libraries and frameworks

0 commit comments

Comments
 (0)