Native Linux and MacOS test

Kielek · Jul 24, 2023 · 7917a05 · 7917a05
1 parent 8455fcf
commit 7917a05
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/build/Build.Steps.Linux.cs b/build/Build.Steps.Linux.cs
@@ -16,8 +16,10 @@ partial class Build
  var buildDirectory = NativeProfilerProject.Directory / "build";
  buildDirectory.CreateDirectory();
 
+ Log.Logger.Warning($"XXXXXXXXXXXX DOTEL_AUTO_VERSION={VersionHelper.GetVersionWithoutSuffixes()}");
+
  CMake.Value(
- arguments: $"../ -DCMAKE_BUILD_TYPE=Release",
+ arguments: $"../ -DCMAKE_BUILD_TYPE=Release -DOTEL_AUTO_VERSION={VersionHelper.GetVersionWithoutSuffixes()}",
  workingDirectory: buildDirectory);
  Make.Value(
  arguments: $"",

diff --git a/build/Build.Steps.MacOS.cs b/build/Build.Steps.MacOS.cs
@@ -13,8 +13,12 @@ partial class Build
  .Executes(() =>
  {
  var nativeProjectDirectory = NativeProfilerProject.Directory;
- CMake.Value(arguments: $".", workingDirectory: nativeProjectDirectory);
- Make.Value(arguments: $"", workingDirectory: nativeProjectDirectory);
+ CMake.Value(
+ arguments: $". -DOTEL_AUTO_VERSION={VersionHelper.GetVersionWithoutSuffixes()}",
+ workingDirectory: nativeProjectDirectory);
+ Make.Value(
+ arguments: $"",
+ workingDirectory: nativeProjectDirectory);
  });
 
  Target PublishNativeProfilerMacOs => _ => _

diff --git a/build/VersionHelper.cs b/build/VersionHelper.cs
@@ -6,4 +6,9 @@ public static string GetVersion()
  {
  return typeof(VersionHelper).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0];
  }
+
+ public static string GetVersionWithoutSuffixes()
+ {
+ return GetVersion().Split('-')[0];
+ }
 }
diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt b/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_policy(SET CMP0015 NEW)
 # Project definition
 # ******************************************************
 
-project("OpenTelemetry.AutoInstrumentation.Native" VERSION 1.0.0)
+project("OpenTelemetry.AutoInstrumentation.Native" VERSION OTEL_AUTO_VERSION)
 
 # ******************************************************
 # Environment detection