Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion Sources/ContainerVersion/ReleaseVersion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,19 @@ import Foundation
public struct ReleaseVersion {
public static func singleLine(appName: String) -> String {
var versionDetails: [String: String] = ["build": buildType()]
versionDetails["commit"] = gitCommit().map { String($0.prefix(7)) } ?? "unspecified"
versionDetails["commit"] = displayCommit(gitCommit())
let extras: String = versionDetails.map { "\($0): \($1)" }.sorted().joined(separator: ", ")

return "\(appName) version \(version()) (\(extras))"
}

static func displayCommit(_ commit: String?) -> String {
guard let commit, !commit.isEmpty, commit != "unspecified" else {
return "unspecified"
}
return String(commit.prefix(7))
}

public static func buildType() -> String {
#if DEBUG
return "debug"
Expand Down
31 changes: 31 additions & 0 deletions Tests/ContainerVersionTests/ReleaseVersionTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//===----------------------------------------------------------------------===//
// Copyright © 2026 Apple Inc. and the container project authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//===----------------------------------------------------------------------===//

import Testing

@testable import ContainerVersion

struct ReleaseVersionTests {
@Test func displayCommitKeepsUnspecifiedPlaceholder() {
#expect(ReleaseVersion.displayCommit(nil) == "unspecified")
#expect(ReleaseVersion.displayCommit("") == "unspecified")
#expect(ReleaseVersion.displayCommit("unspecified") == "unspecified")
}

@Test func displayCommitShortensGitCommit() {
#expect(ReleaseVersion.displayCommit("1234567890abcdef") == "1234567")
}
}