Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

APP-6696 include os_version tag on GOOS=darwin #4536

Merged
merged 2 commits into from
Nov 13, 2024
Merged

APP-6696 include os_version tag on GOOS=darwin #4536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996d825
switch stmt, factor out timer
abe-winter Nov 6, 2024
b248282
call sw_vers and parse response
abe-winter Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions config/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ var (
cudaRegex = regexp.MustCompile(`Cuda compilation tools, release (\d+)\.`)
aptCacheVersionRegex = regexp.MustCompile(`\nVersion: (\d+)\D`)
piModelRegex = regexp.MustCompile(`Raspberry Pi\s?(Compute Module)?\s?(\d\w*)?\s?(\w+)?\s?(Model (.+))? Rev`)
darwinVersionRegex = regexp.MustCompile(`(\d+)\.`)
savedPlatformTags []string
)

// helper to read platform tags for GPU-related system libraries.
func readGPUTags(logger logging.Logger, tags []string) []string {
// this timeout is for all steps in this function.
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()
func readGPUTags(ctx context.Context, logger logging.Logger, tags []string) []string {
if _, err := exec.LookPath("nvcc"); err == nil {
out, err := exec.CommandContext(ctx, "nvcc", "--version").Output()
if err != nil {
Expand All @@ -33,7 +31,7 @@ func readGPUTags(logger logging.Logger, tags []string) []string {
if match := cudaRegex.FindSubmatch(out); match != nil {
tags = append(tags, "cuda:true", "cuda_version:"+string(match[1]))
} else {
logger.Errorw("error parsing `nvcc --version` output. Cuda-specific modules may not load")
logger.Error("error parsing `nvcc --version` output. Cuda-specific modules may not load")
}
}
if _, err := exec.LookPath("apt-cache"); err == nil {
Expand Down Expand Up @@ -139,20 +137,43 @@ func readLinuxTags(logger logging.Logger, tags []string) []string {
return tags
}

func readDarwinTags(ctx context.Context, logger logging.Logger, tags []string) []string {
if _, err := exec.LookPath("sw_vers"); err == nil {
out, err := exec.CommandContext(ctx, "sw_vers", "--productVersion").Output()
if err != nil {
logger.Errorw("error getting darwin version from sw_vers. Mac-specific modules may not load", "err", err)
}
if match := darwinVersionRegex.FindSubmatch(out); match != nil {
tags = append(tags, "os_version:"+string(match[1]))
} else {
logger.Errorw("error parsing sw_vers version output. Mac-specific modules may not load", "input", string(out))
}
}
return tags
}

// This reads the granular platform constraints (os version, distro, etc).
// This further constrains the basic runtime.GOOS/GOARCH stuff in getAgentInfo
// so module authors can publish builds with ABI or SDK dependencies. The
// list of tags returned by this function is expected to grow.
func readExtendedPlatformTags(logger logging.Logger, cache bool) []string {
// TODO(APP-6696): CI in multiple environments (alpine + mac), darwin support.
if cache && savedPlatformTags != nil {
return savedPlatformTags
}

// this timeout is for all steps in this function.
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()

tags := make([]string, 0, 3)
if runtime.GOOS == "linux" {

switch runtime.GOOS {
case "linux":
tags = readLinuxTags(logger, tags)
tags = readGPUTags(logger, tags)
tags = readGPUTags(ctx, logger, tags)
tags = readPiTags(logger, tags)
case "darwin":
tags = readDarwinTags(ctx, logger, tags)
}
if cache {
savedPlatformTags = tags
Expand Down
Loading