From bebbbaee46d237c4946432dc3aab124b6d5d6610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 3 Sep 2024 19:25:45 +0200 Subject: [PATCH 1/3] Restrict Packit targets to those that support Go 1.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on https://github.com/containers/podman/commit/54b8c4fb64e9d362eeb434999735c2e99944f555 by Paul Holzinger . Signed-off-by: Miloslav Trmač --- .packit.yaml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e72bfb15..1e20f1bc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -30,8 +30,12 @@ jobs: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-all-x86_64: {} - fedora-all-aarch64: {} + fedora-development-x86_64: {} + fedora-development-aarch64: {} + fedora-latest-x86_64: {} + fedora-latest-aarch64: {} + fedora-latest-stable-x86_64: {} + fedora-latest-stable-aarch64: {} fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -51,14 +55,15 @@ jobs: - centos-stream-10-aarch64 enable_net: true - - job: copr_build - trigger: pull_request - packages: [skopeo-rhel] - notifications: *copr_build_failure_notification - targets: - - epel-9-x86_64 - - epel-9-aarch64 - enable_net: true + # Disabled until there is go 1.22 in epel-9 + # - job: copr_build + # trigger: pull_request + # packages: [skopeo-rhel] + # notifications: *copr_build_failure_notification + # targets: + # - epel-9-x86_64 + # - epel-9-aarch64 + # enable_net: true # Run on commit to main branch - job: copr_build From 795705e41c0b36c002075ab61ed73073d2a62005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 22 Aug 2024 21:50:18 +0200 Subject: [PATCH 2/3] Update to Go 1.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- go.mod | 2 +- install.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1881d19d..3cce2a5c 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/containers/skopeo // Minimum required golang version -go 1.21.0 +go 1.22.0 // Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates diff --git a/install.md b/install.md index f70f1a79..0accefcd 100644 --- a/install.md +++ b/install.md @@ -139,7 +139,7 @@ located at [https://github.com/containers/image_build/tree/main/skopeo](https:// Otherwise, read on for building and installing it from source: -To build the `skopeo` binary you need at least Go 1.21. +To build the `skopeo` binary you need at least Go 1.22. There are two ways to build skopeo: in a container, or locally without a container. Choose the one which better matches your needs and environment. From 9166a97bbb536e64620793e49d53f2d4d76ce63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 22 Aug 2024 21:54:36 +0200 Subject: [PATCH 3/3] Use a range expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miloslav Trmač --- integration/registry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/registry.go b/integration/registry.go index 3189bffc..320fa425 100644 --- a/integration/registry.go +++ b/integration/registry.go @@ -30,7 +30,7 @@ func setupRegistryV2At(t *testing.T, url string, auth, schema1 bool) *testRegist require.NoError(t, err) // Wait for registry to be ready to serve requests. - for i := 0; i != 50; i++ { + for range 50 { if err = reg.Ping(); err == nil { break }