[release-1.13] Bump to v1.13.1

As the title says In prep for Feature Freeze testing for RHEL 8.9/9.3 [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Merge pull request #2049 from TomSweeneyRedHat/dev/tsweeney/com_055.2
2026-01-30 13:58:48 +00:00 · 2023-07-19 19:28:55 -04:00 · 2023-07-20 00:58:09 +02:00 · 2023-07-19 18:01:42 -04:00 · 2023-07-11 15:48:20 -04:00 · 2023-07-10 09:27:27 -04:00
5 changed files with 23 additions and 6 deletions
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/containers/skopeo
 go 1.18

 require (
-	github.com/containers/common v0.55.1
+	github.com/containers/common v0.55.2
 	github.com/containers/image/v5 v5.26.1
 	github.com/containers/ocicrypt v1.1.7
 	github.com/containers/storage v1.48.0
--- a/go.sum
+++ b/go.sum
@@ -31,8 +31,8 @@ github.com/containerd/containerd v1.7.2 h1:UF2gdONnxO8I6byZXDi5sXWiWvlW3D/sci7dT
 github.com/containerd/containerd v1.7.2/go.mod h1:afcz74+K10M/+cjGHIVQrCt3RAQhUSCAjJ9iMYhhkuI=
 github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=
 github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
-github.com/containers/common v0.55.1 h1:sOlcIxEYXoR3OSHufew7CuSeOWr7a2jHGYw3r+xKA1k=
-github.com/containers/common v0.55.1/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk=
+github.com/containers/common v0.55.2 h1:Cd+vmkUPDrPvL2v4Te1Wew6SIZdn4/XiyiBRT9IbcGg=
+github.com/containers/common v0.55.2/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk=
 github.com/containers/image/v5 v5.26.1 h1:8y3xq8GO/6y8FR+nAedHPsAFiAtOrab9qHTBpbqaX8g=
 github.com/containers/image/v5 v5.26.1/go.mod h1:IwlOGzTkGnmfirXxt0hZeJlzv1zVukE03WZQ203Z9GA=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
--- a/rpm/update-spec-provides.sh
+++ b/rpm/update-spec-provides.sh
@@ -5,13 +5,30 @@
 # The goimports don't need to be present upstream.

 set -eo pipefail
+set -x

 PACKAGE=skopeo
 # script is run from git root directory
 SPEC_FILE=rpm/$PACKAGE.spec

+# Needed for golist to work
+# This is run in the packit sandbox environment for downstream tasks and
+# doesn't affect upstream repo and CI.
+export GOPATH=~/go
+GOPATHDIR=$GOPATH/src/github.com/containers/
+mkdir -p $GOPATHDIR
+ln -sf $(pwd) $GOPATHDIR/.
+
+# Packit sandbox doesn't allow root
+# Install golist by downloading and extracting rpm
+# We could handle this in packit `sandcastle` upstream itself
+# but that depends on golist existing in epel
+# https://github.com/packit/sandcastle/pull/186
+dnf download golist
+rpm2cpio golist-*.rpm | cpio -idmv
+
 sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE

-GO_IMPORTS=$(golist --imported --package-path github.com/containers/$PACKAGE --skip-self | sort -u | xargs "-I{}" echo "Provides: bundled(golang({}))")
+GO_IMPORTS=$(./usr/bin/golist --imported --package-path github.com/containers/$PACKAGE --skip-self | sort -u | xargs "-I{}" echo "Provides: bundled(golang({}))")

 awk -v r="$GO_IMPORTS" '/^# vendored libraries/ {print; print r; next} 1' $SPEC_FILE > temp && mv temp $SPEC_FILE
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -62,7 +62,7 @@ github.com/containerd/containerd/log
 ## explicit; go 1.19
 github.com/containerd/stargz-snapshotter/estargz
 github.com/containerd/stargz-snapshotter/estargz/errorutil
-# github.com/containers/common v0.55.1
+# github.com/containers/common v0.55.2
 ## explicit; go 1.18
 github.com/containers/common/pkg/auth
 github.com/containers/common/pkg/capabilities
--- a/version/version.go
+++ b/version/version.go
@@ -1,4 +1,4 @@
 package version

 // Version is the version of the build.
-const Version = "1.12.1-dev"
+const Version = "1.13.1"
Author	SHA1	Message	Date
TomSweeneyRedHat	8ace37a410	[release-1.13] Bump to v1.13.1 As the title says In prep for Feature Freeze testing for RHEL 8.9/9.3 [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>	2023-07-19 19:28:55 -04:00
Miloslav Trmač	b8e070cbf3	Merge pull request #2049 from TomSweeneyRedHat/dev/tsweeney/com_055.2 [release-1.13] Bump c/common to v0.55.2	2023-07-20 00:58:09 +02:00
TomSweeneyRedHat	cac20311f1	[release-1.13] Bump c/common to v0.55.2 Bump c/common to v0.55.2 [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>	2023-07-19 18:01:42 -04:00
Lokesh Mandvekar	d5b1f34e26	[release-1.13 backport] [CI:BUILD] Packit: install golist before updating downstream spec The default Packit sandbox environment that runs Packit tasks for downstream Fedora does not have golist installed by default and can't run superuser tasks. This commit will download and extract the golist binary from the Fedora rpm and use it to provide golist. The GOPATH mention in `rpm/update-spec-provides.sh` is only required for golist to generate the gopaths and doesn't affect upstream or the rpm spec. Currently, the only way to reliably test this is on an open github issue by running `/packit propose-downstream`. This can't be run on an open PR. The job-specific packit actions can only be tested via the packit service and not via packit cli. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (cherry picked from commit `a39972ca35`) Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>	2023-07-11 15:48:20 -04:00
Daniel J Walsh	f30bf04e73	Merge pull request #2038 from TomSweeneyRedHat/dev/tsweeney/bumpver [release-1.13] Bump to v1.13.1-dev	2023-07-10 09:27:27 -04:00
Tom Sweeney	85d99af242	[release-1.13] Bump to v1.13.1-dev As the title says. Bumping the version to dev in the 1.13 release branch. [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <tsweeney@redhat.com>	2023-07-06 10:48:31 -04:00
Tom Sweeney	8b9999e1d5	Bump to v1.13.0 As the title says. In preparation of RHEL 8.9/9.3 [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <tsweeney@redhat.com>	2023-07-05 16:16:38 -04:00