[CI:BUILD] 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 [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
c9c46fdf23
commit
4e4078dbbc
|
|
@ -29,9 +29,6 @@ jobs:
|
|||
update_release: false
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
actions:
|
||||
pre-sync:
|
||||
- "bash rpm/update-spec-provides.sh"
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
|
|
|
|||
|
|
@ -108,8 +108,6 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
|
|||
Provides: %{name}-quadlet
|
||||
Obsoletes: %{name}-quadlet <= 5:4.4.0-1
|
||||
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
|
||||
# DO NOT DELETE BELOW LINE - used for updating downstream goimports
|
||||
# vendored libraries
|
||||
|
||||
%description
|
||||
%{name} (Pod Manager) is a fully featured container engine that is a simple
|
||||
|
|
|
|||
|
|
@ -1,29 +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 -eox pipefail
|
||||
|
||||
PACKAGE=podman
|
||||
# script is run from git root directory
|
||||
SPEC_FILE=rpm/$PACKAGE.spec
|
||||
|
||||
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
|
||||
Loading…
Reference in New Issue