Skip to content

Commit

Permalink
Drop support to MacOs12 (#3720)
Browse files Browse the repository at this point in the history
  • Loading branch information
ysolomchenko authored Nov 8, 2024
1 parent 996bdb0 commit 6d10456
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-nuget-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jobs:
- name: Download Mac-OS Artifacts from build job
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8
with:
name: bin-macos-12
path: bin/ci-artifacts/bin-macos-12
name: bin-macos-13
path: bin/ci-artifacts/bin-macos-13

- name: Build NuGet packages
run: ./build.cmd BuildNuGetPackages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
- machine: ubuntu-20.04
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-12
- machine: macos-13
log-dir: "/var/log/opentelemetry/dotnet"
- machine: otel-linux-arm64
log-dir: "/var/log/opentelemetry/dotnet"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
fail-fast: false
matrix:
test-tfm: [ net8.0, net7.0, net6.0, net462 ]
machine: [ windows-2022, ubuntu-20.04, macos-12, otel-linux-arm64 ]
machine: [ windows-2022, ubuntu-20.04, macos-13, otel-linux-arm64 ]
exclude:
- test-tfm: net462
machine: macos-12
machine: macos-13
- test-tfm: net462
machine: ubuntu-20.04
- test-tfm: net462
Expand All @@ -45,7 +45,7 @@ jobs:
containers: none
- machine: ubuntu-20.04
containers: linux
- machine: macos-12
- machine: macos-13
containers: none
- machine: otel-linux-arm64
containers: linux
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
matrix:
include:
- machine: ubuntu-20.04
- machine: macos-12
- machine: macos-13
- machine: windows-2022
- machine: otel-linux-arm64
runs-on: ${{ matrix.machine }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
machine: [ windows-2022, ubuntu-20.04, macos-12 ]
machine: [ windows-2022, ubuntu-20.04, macos-13 ]
runs-on: ${{ matrix.machine }}
steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
- machine: ubuntu-20.04
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-12
- machine: macos-13
log-dir: "/var/log/opentelemetry/dotnet"
- machine: otel-linux-arm64
log-dir: "/var/log/opentelemetry/dotnet"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- run: cd bin-ubuntu-20.04 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip . * ; cd ..
- run: cd bin-otel-linux-arm64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-arm64.zip . * ; cd ..
- run: cd bin-windows-2022 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-windows.zip . * ; cd ..
- run: cd bin-macos-12 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-macos.zip . * ; cd ..
- run: cd bin-macos-13 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-macos.zip . * ; cd ..
- run: cd bin-nuget-packages ; zip -qq -r ../opentelemetry-dotnet-instrumentation-nuget-packages.zip . * ; cd ..
- run: cp installation-scripts-windows-2022/otel-dotnet-auto-install.sh ./otel-dotnet-auto-install.sh
- run: cp installation-scripts-windows-2022/OpenTelemetry.DotNet.Auto.psm1 ./OpenTelemetry.DotNet.Auto.psm1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
containers: windows
- machine: ubuntu-20.04
containers: linux
- machine: macos-12
- machine: macos-13
containers: none
- machine: otel-linux-arm64
containers: linux
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h

### Removed

- Support for macOS Monterey 12 x64.
macOs libraries are built and tested against [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md).

### Fixed

## [1.9.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.9.0)
Expand Down
2 changes: 1 addition & 1 deletion build/Build.NuGet.Steps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ partial class Build
"bin-alpine-arm64/linux-musl-arm64",
"bin-ubuntu-20.04/linux-x64",
"bin-otel-linux-arm64/linux-arm64",
"bin-macos-12/osx-x64",
"bin-macos-13/osx-x64",
"bin-windows-2022/win-x64",
"bin-windows-2022/win-x86"
};
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ CI tests run against the following operating systems:
- [CentOS 7 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-build.dockerfile)
(.NET 8 is not supported)
- [CentOS Stream 9 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-stream9.dockerfile)
- [macOS Monterey 12 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md)
- [macOS Ventura 13 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md)
- [Microsoft Windows Server 2022 x64](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md)
- [Ubuntu 20.04 LTS x64](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md)
- Ubuntu 22.04 LTS ARM64
Expand Down
2 changes: 1 addition & 1 deletion docs/developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ it assumes that the code is run from the root of the repository and the CI
artifacts we added to `~/Downloads/`:

```PowerShell
$artifacts = @("bin-alpine", "bin-centos", "bin-macos-12", "bin-windows-2022")
$artifacts = @("bin-alpine", "bin-centos", "bin-macos-13", "bin-windows-2022")
$destFolder = "./bin/ci-artifacts/"
$zipFilesFolder = "~/Downloads/"
Expand Down

0 comments on commit 6d10456

Please sign in to comment.