Skip to content

Commit cfe5bdb

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #27351 from mheon/bump_600_dev
Bump Go version to v6
2 parents 1175578 + 34166fc commit cfe5bdb

File tree

1,001 files changed

+2700
-2700
lines changed

Some content is hidden

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

1,001 files changed

+2700
-2700
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ ifdef SOURCE_DATE_EPOCH
123123
else
124124
BUILD_INFO ?= $(shell date "+$(DATE_FMT)")
125125
endif
126-
LIBPOD := ${PROJECT}/v5/libpod
126+
LIBPOD := ${PROJECT}/v6/libpod
127127
GOFLAGS ?= -trimpath
128128
LDFLAGS_PODMAN ?= \
129129
$(if $(GIT_COMMIT),-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT),) \
130130
$(if $(BUILD_INFO),-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO),) \
131131
$(if $(BUILD_ORIGIN),-X "$(LIBPOD)/define.buildOrigin=$(BUILD_ORIGIN)",) \
132132
-X $(LIBPOD)/config._installPrefix=$(PREFIX) \
133133
-X $(LIBPOD)/config._etcDir=$(ETCDIR) \
134-
-X $(PROJECT)/v5/pkg/systemd/quadlet._binDir=$(BINDIR) \
134+
-X $(PROJECT)/v6/pkg/systemd/quadlet._binDir=$(BINDIR) \
135135
-X go.podman.io/image/v5/signature/internal/sequoia.sequoiaLibraryDir='"$(SEQUOIA_SONAME_DIR)"' \
136136
-X go.podman.io/common/pkg/config.additionalHelperBinariesDir=$(HELPER_BINARIES_DIR)\
137137
$(EXTRA_LDFLAGS)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Podman: A tool for managing OCI containers and pods
44
![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)
55
![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/containers/podman)
6-
[![Go Report Card](https://goreportcard.com/badge/github.com/containers/podman/v5)](https://goreportcard.com/report/github.com/containers/podman/v5)
6+
[![Go Report Card](https://goreportcard.com/badge/github.com/containers/podman/v6)](https://goreportcard.com/report/github.com/containers/podman/v6)
77
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10499/badge)](https://www.bestpractices.dev/projects/10499)
88

99
[![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=containers-podman)](https://insights.linuxfoundation.org/project/containers-podman)

‎cmd/podman-testing/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package main
55
import (
66
"fmt"
77

8-
"github.com/containers/podman/v5/cmd/podman/validate"
9-
"github.com/containers/podman/v5/internal/domain/entities"
8+
"github.com/containers/podman/v6/cmd/podman/validate"
9+
"github.com/containers/podman/v6/internal/domain/entities"
1010
"github.com/spf13/cobra"
1111
"go.podman.io/common/pkg/completion"
1212
)

‎cmd/podman-testing/data.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"errors"
77
"os"
88

9-
"github.com/containers/podman/v5/cmd/podman/validate"
10-
"github.com/containers/podman/v5/internal/domain/entities"
9+
"github.com/containers/podman/v6/cmd/podman/validate"
10+
"github.com/containers/podman/v6/internal/domain/entities"
1111
"github.com/spf13/cobra"
1212
"go.podman.io/common/pkg/completion"
1313
)

‎cmd/podman-testing/layer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"errors"
77
"os"
88

9-
"github.com/containers/podman/v5/cmd/podman/validate"
10-
"github.com/containers/podman/v5/internal/domain/entities"
9+
"github.com/containers/podman/v6/cmd/podman/validate"
10+
"github.com/containers/podman/v6/internal/domain/entities"
1111
"github.com/spf13/cobra"
1212
"go.podman.io/common/pkg/completion"
1313
)

‎cmd/podman-testing/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"os/exec"
1111
"syscall"
1212

13-
_ "github.com/containers/podman/v5/cmd/podman/completion"
14-
ientities "github.com/containers/podman/v5/internal/domain/entities"
15-
"github.com/containers/podman/v5/internal/domain/infra"
16-
"github.com/containers/podman/v5/pkg/domain/entities"
13+
_ "github.com/containers/podman/v6/cmd/podman/completion"
14+
ientities "github.com/containers/podman/v6/internal/domain/entities"
15+
"github.com/containers/podman/v6/internal/domain/infra"
16+
"github.com/containers/podman/v6/pkg/domain/entities"
1717
"github.com/sirupsen/logrus"
1818
"github.com/spf13/cobra"
1919
"go.podman.io/common/pkg/config"

‎cmd/podman-testing/remove.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package main
55
import (
66
"fmt"
77

8-
"github.com/containers/podman/v5/cmd/podman/validate"
9-
"github.com/containers/podman/v5/internal/domain/entities"
8+
"github.com/containers/podman/v6/cmd/podman/validate"
9+
"github.com/containers/podman/v6/internal/domain/entities"
1010
"github.com/spf13/cobra"
1111
"go.podman.io/common/pkg/completion"
1212
)

‎cmd/podman-testing/store_supported.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"os"
88

9-
"github.com/containers/podman/v5/pkg/domain/entities"
9+
"github.com/containers/podman/v6/pkg/domain/entities"
1010
"go.podman.io/storage"
1111
"go.podman.io/storage/types"
1212
)

‎cmd/podman-wslkerninst/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111
"unsafe"
1212

13-
"github.com/containers/podman/v5/pkg/machine/wsl/wutil"
13+
"github.com/containers/podman/v6/pkg/machine/wsl/wutil"
1414
"github.com/sirupsen/logrus"
1515
"golang.org/x/sys/windows/svc/eventlog"
1616
)

‎cmd/podman/artifact/add.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"fmt"
55
"path/filepath"
66

7-
"github.com/containers/podman/v5/cmd/podman/common"
8-
"github.com/containers/podman/v5/cmd/podman/registry"
9-
"github.com/containers/podman/v5/pkg/domain/entities"
10-
"github.com/containers/podman/v5/pkg/domain/utils"
7+
"github.com/containers/podman/v6/cmd/podman/common"
8+
"github.com/containers/podman/v6/cmd/podman/registry"
9+
"github.com/containers/podman/v6/pkg/domain/entities"
10+
"github.com/containers/podman/v6/pkg/domain/utils"
1111
"github.com/spf13/cobra"
1212
"go.podman.io/common/pkg/completion"
1313
)

0 commit comments

Comments
 (0)