diff --git a/.packit.yaml b/.packit.yaml index 9596ac9b1a..c4570b91f1 100644 --- 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 diff --git a/rpm/skopeo.spec b/rpm/skopeo.spec index 2c277ef843..d53cf88216 100644 --- 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 diff --git a/rpm/update-spec-provides.sh b/rpm/update-spec-provides.sh deleted file mode 100644 index f68de29e86..0000000000 --- a/rpm/update-spec-provides.sh +++ /dev/null @@ -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