Skip to content

Commit

Permalink
feat: add OS/Arch information into oras version (#1556)
Browse files Browse the repository at this point in the history
Signed-off-by: Xiaoxuan Wang <[email protected]>
  • Loading branch information
wangxiaoxuan273 authored Dec 3, 2024
1 parent 325572c commit 2703462
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 0 deletions.
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() {
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()
})
})
})

0 comments on commit 2703462

Please sign in to comment.