[release-1.13] Bump to v1.13.2

As the title says. [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
[release-1.31] Bump c/common v0.55.3
2026-02-01 06:51:21 +00:00 · 2023-08-10 10:58:15 -04:00 · 2023-08-10 10:56:07 -04:00 · 2023-07-20 23:21:21 +02:00 · 2023-07-20 16:17:49 -04:00 · 2023-07-20 14:17:25 -04:00
7 changed files with 5 additions and 44 deletions
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -35,9 +35,6 @@ jobs:
    update_release: false
    dist_git_branches:
      - fedora-all
-    actions:
-        pre-sync:
-          - "bash rpm/update-spec-provides.sh"

  - job: koji_build
    trigger: commit
--- 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.2
+	github.com/containers/common v0.55.3
 	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.2 h1:Cd+vmkUPDrPvL2v4Te1Wew6SIZdn4/XiyiBRT9IbcGg=
-github.com/containers/common v0.55.2/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk=
+github.com/containers/common v0.55.3 h1:mhNQRU4OgW1wpmmKMFSYRn42+hr8SEVSPFdKML3WZik=
+github.com/containers/common v0.55.3/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/skopeo.spec
+++ b/rpm/skopeo.spec
@@ -69,8 +69,6 @@ BuildRequires: glib2-devel
 BuildRequires: make
 BuildRequires: shadow-utils-subid-devel
 Requires: containers-common >= 4:1-21
-# DO NOT DELETE BELOW LINE - used for updating downstream goimports
-# vendored libraries

 %description
 Command line utility to inspect images and repositories directly on Docker
--- a/rpm/update-spec-provides.sh
+++ b/rpm/update-spec-provides.sh
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# This script will update the goimports in the rpm spec for downstream fedora
-# packaging, via the `propose-downstream` packit action.
-# 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=$(./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.2
+# github.com/containers/common v0.55.3
 ## 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.13.1"
+const Version = "1.13.2"
Author	SHA1	Message	Date
TomSweeneyRedHat	24c0c3369d	[release-1.13] Bump to v1.13.2 As the title says. [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>	2023-08-10 10:58:15 -04:00
TomSweeneyRedHat	ac1c77b894	[release-1.31] Bump c/common v0.55.3 As the title says [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>	2023-08-10 10:56:07 -04:00
Miloslav Trmač	416218f501	Merge pull request #2053 from lsm5/release-1.13-packit-pre-sync-backport Packit: remove pre-sync action	2023-07-20 23:21:21 +02:00
Lokesh Mandvekar	882b087b3a	Packit: remove pre-sync action The pre-sync action constantly breaks and is currently not possible to reliably test until the subsequent upstream release due to limitations in packit. The lines being added by the action script to the downstream Fedora spec were only meant to keep Fedora happy. But given that they provide no tangible benefit as github notifies us of security issues in libraries mentioned in go.mod and go.sum, along with redhat prodsec's own magic for creating security alerts, there's absolutely no point to having the pre-sync action run and add a layer of uncertainty. This commit removes the pre-sync action and `rpm/update-spec-provides.sh`. Ref: https://github.com/containers/podman/issues/19232 Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (cherry picked from commit `a4aa15f4fa`) Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>	2023-07-20 16:17:49 -04:00
Tom Sweeney	dbb7d4db50	Merge pull request #2050 from TomSweeneyRedHat/dev/tsweeney/1.13.1 [release-1.13] Bump to v1.13.1	2023-07-20 14:17:25 -04:00
TomSweeneyRedHat	3162e17e4d	[release-1.13] Bump to v1.13.2-dev As the title says. Bump back to a dev version. [NO NEW TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>	2023-07-19 19:30:27 -04:00