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.

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

feat: add OS/Arch information into oras version #1556

Merged
merged 4 commits into from
Dec 3, 2024
Merged
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
1 change: 1 addition & 0 deletions cmd/oras/root/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func runVersion(printer *output.Printer) error {
items := [][]string{
{"Version", version.GetVersion()},
{"Go version", runtime.Version()},
{"OS/Arch", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)},
}
if version.GitCommit != "" {
items = append(items, []string{"Git commit", version.GitCommit})
Expand Down
31 changes: 31 additions & 0 deletions test/e2e/suite/command/version_darwin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//go:build darwin

/*
Copyright The ORAS 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

http://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.
*/

package command

import (
. "github.com/onsi/ginkgo/v2"
. "oras.land/oras/test/e2e/internal/utils"
)

var _ = Describe("ORAS darwin user:", func() {
qweeah marked this conversation as resolved.
Show resolved Hide resolved
When("checking oras version", func() {
It("should run version command and show OS/Arch information", func() {
ORAS("version").MatchKeyWords("OS/Arch:", "darwin/").Exec()
})
})
})
31 changes: 31 additions & 0 deletions test/e2e/suite/command/version_linux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//go:build linux

/*
Copyright The ORAS 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

http://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.
*/

package command

import (
. "github.com/onsi/ginkgo/v2"
. "oras.land/oras/test/e2e/internal/utils"
)

var _ = Describe("ORAS linux user:", func() {
When("checking oras version", func() {
It("should run version command and show OS/Arch information", func() {
ORAS("version").MatchKeyWords("OS/Arch:", "linux/").Exec()
})
})
})
Loading