Skip to content

Commit 942f789

Browse files
committed
set !remote build tags where needed
The new golangci-lint version 1.60.1 has problems with typecheck when linting remote files. We have certain pakcages that should never be inlcuded in remote but the typecheck tries to compile all of them but this never works and it seems to ignore the exclude files we gave it. To fix this the proper way is to mark all packages we only use locally with !remote tags. This is a bit ugly but more correct. I also moved the DecodeChanges() code around as it is called from the client so the handles package which should only be remote doesn't really fit anyway. Signed-off-by: Paul Holzinger <[email protected]>
1 parent c17daf2 commit 942f789

File tree

158 files changed

+305
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+305
-56
lines changed

cmd/podman-testing/create.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package main
24

35
import (

cmd/podman-testing/data.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package main
24

35
import (

cmd/podman-testing/layer.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package main
24

35
import (

cmd/podman-testing/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package main
24

35
import (

cmd/podman-testing/remove.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package main
24

35
import (

cmd/podman-testing/store_supported.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build linux && !remote
2-
// +build linux,!remote
32

43
package main
54

cmd/podman-testing/store_unsupported.go

Lines changed: 0 additions & 16 deletions
This file was deleted.

cmd/podman/containers/commit.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/containers/common/pkg/completion"
1010
"github.com/containers/podman/v5/cmd/podman/common"
1111
"github.com/containers/podman/v5/cmd/podman/registry"
12-
"github.com/containers/podman/v5/pkg/api/handlers"
1312
"github.com/containers/podman/v5/pkg/domain/entities"
1413
"github.com/spf13/cobra"
1514
)
@@ -105,9 +104,6 @@ func commit(cmd *cobra.Command, args []string) error {
105104
if !commitOptions.Quiet {
106105
commitOptions.Writer = os.Stderr
107106
}
108-
if len(commitOptions.Changes) > 0 {
109-
commitOptions.Changes = handlers.DecodeChanges(commitOptions.Changes)
110-
}
111107
if len(configFile) > 0 {
112108
cfg, err := os.ReadFile(configFile)
113109
if err != nil {

internal/domain/entities/engine_testing.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package entities
24

35
import (

internal/domain/entities/testing.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !remote
2+
13
package entities
24

35
type CreateStorageLayerOptions struct {

0 commit comments

Comments
 (0)