diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-18 11:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 11:24:58 +0100 |
| commit | f8b04bf56c44411e39e355446c4a311dc9fcb373 (patch) | |
| tree | 50bbd35bb2b90c206e82c74771dbef43593c0d9d /pkg/machine | |
| parent | d72a829f59992dfe29cb84125fde3cce631e6436 (diff) | |
| parent | ea08765f400d828907f231baa84bd880a00d95f1 (diff) | |
| download | podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.gz podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.bz2 podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.zip | |
Merge pull request #13552 from vrothberg/go1.18
go fmt: use go 1.18 conditional-build syntax
Diffstat (limited to 'pkg/machine')
| -rw-r--r-- | pkg/machine/fcos.go | 1 | ||||
| -rw-r--r-- | pkg/machine/fedora.go | 1 | ||||
| -rw-r--r-- | pkg/machine/ignition_darwin.go | 3 | ||||
| -rw-r--r-- | pkg/machine/ignition_schema.go | 1 | ||||
| -rw-r--r-- | pkg/machine/ignition_windows.go | 3 | ||||
| -rw-r--r-- | pkg/machine/keys.go | 1 | ||||
| -rw-r--r-- | pkg/machine/machine_unsupported.go | 1 | ||||
| -rw-r--r-- | pkg/machine/pull.go | 1 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine_unsupported.go | 1 | ||||
| -rw-r--r-- | pkg/machine/wsl/machine_unsupported.go | 1 |
10 files changed, 12 insertions, 2 deletions
diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index 4d3e2edf4..6215ae08f 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 // +build amd64 arm64 package machine diff --git a/pkg/machine/fedora.go b/pkg/machine/fedora.go index cd713dde7..b26921b52 100644 --- a/pkg/machine/fedora.go +++ b/pkg/machine/fedora.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 // +build amd64 arm64 package machine diff --git a/pkg/machine/ignition_darwin.go b/pkg/machine/ignition_darwin.go index 9ede4b026..b9fbf218d 100644 --- a/pkg/machine/ignition_darwin.go +++ b/pkg/machine/ignition_darwin.go @@ -1,4 +1,5 @@ -//+build darwin +//go:build darwin +// +build darwin package machine diff --git a/pkg/machine/ignition_schema.go b/pkg/machine/ignition_schema.go index 8cfb0d04e..d6b86229c 100644 --- a/pkg/machine/ignition_schema.go +++ b/pkg/machine/ignition_schema.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 // +build amd64 arm64 package machine diff --git a/pkg/machine/ignition_windows.go b/pkg/machine/ignition_windows.go index c0de48bd3..0fcc06273 100644 --- a/pkg/machine/ignition_windows.go +++ b/pkg/machine/ignition_windows.go @@ -1,4 +1,5 @@ -//+build windows +//go:build windows +// +build windows package machine diff --git a/pkg/machine/keys.go b/pkg/machine/keys.go index 711b091f0..15c1f73d8 100644 --- a/pkg/machine/keys.go +++ b/pkg/machine/keys.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 // +build amd64 arm64 package machine diff --git a/pkg/machine/machine_unsupported.go b/pkg/machine/machine_unsupported.go index da1437984..a12140e16 100644 --- a/pkg/machine/machine_unsupported.go +++ b/pkg/machine/machine_unsupported.go @@ -1,3 +1,4 @@ +//go:build !amd64 && !arm64 // +build !amd64,!arm64 package machine diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go index cf1e708b1..26abedfcd 100644 --- a/pkg/machine/pull.go +++ b/pkg/machine/pull.go @@ -1,3 +1,4 @@ +//go:build amd64 || arm64 // +build amd64 arm64 package machine diff --git a/pkg/machine/qemu/machine_unsupported.go b/pkg/machine/qemu/machine_unsupported.go index e3ce05e3d..794e710f9 100644 --- a/pkg/machine/qemu/machine_unsupported.go +++ b/pkg/machine/qemu/machine_unsupported.go @@ -1,3 +1,4 @@ +//go:build (!amd64 && !arm64) || windows // +build !amd64,!arm64 windows package qemu diff --git a/pkg/machine/wsl/machine_unsupported.go b/pkg/machine/wsl/machine_unsupported.go index 043c5d729..856f9dd0c 100644 --- a/pkg/machine/wsl/machine_unsupported.go +++ b/pkg/machine/wsl/machine_unsupported.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package wsl |