mirror of
https://github.com/containers/podman.git
synced 2025-06-21 17:38:12 +08:00
Merge pull request #18687 from lsm5/packit-downstream-followup
[CI:BUILD] Packit: set propose-downstream action type to pre-sync
This commit is contained in:
@ -33,11 +33,9 @@ jobs:
|
|||||||
update_release: false
|
update_release: false
|
||||||
dist_git_branches:
|
dist_git_branches:
|
||||||
- fedora-all
|
- fedora-all
|
||||||
#TODO use the right action to update the goimports
|
actions:
|
||||||
# For whatever reason, none of the actions seem to work
|
pre-sync:
|
||||||
#actions:
|
- "cd rpm && bash update-spec-provides.sh"
|
||||||
# create-patches:
|
|
||||||
# - "cd rpm && bash update-spec-provides.sh"
|
|
||||||
|
|
||||||
- job: koji_build
|
- job: koji_build
|
||||||
trigger: commit
|
trigger: commit
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
.PHONY: rpm
|
||||||
rpm:
|
rpm:
|
||||||
$(shell /usr/bin/bash ./update-spec-version.sh)
|
$(shell /usr/bin/bash ./update-spec-version.sh)
|
||||||
spectool -g podman.spec
|
spectool -g podman.spec
|
||||||
sudo dnf -y builddep podman.spec
|
|
||||||
rpmbuild -ba \
|
rpmbuild -ba \
|
||||||
--define '_sourcedir $(shell pwd)' \
|
--define '_sourcedir $(shell pwd)' \
|
||||||
--define '_rpmdir %{_sourcedir}/RPMS' \
|
--define '_rpmdir %{_sourcedir}/RPMS' \
|
||||||
|
@ -154,8 +154,6 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
|
|||||||
Provides: %{name}-quadlet
|
Provides: %{name}-quadlet
|
||||||
Obsoletes: %{name}-quadlet <= 5:4.4.0-1
|
Obsoletes: %{name}-quadlet <= 5:4.4.0-1
|
||||||
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
|
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
|
||||||
# TODO: need to find the right action in packit propose-downstream to update
|
|
||||||
# the goimports here. None of the actions seem to work so far.
|
|
||||||
# DO NOT DELETE BELOW LINE - used for updating downstream goimports
|
# DO NOT DELETE BELOW LINE - used for updating downstream goimports
|
||||||
# vendored libraries
|
# vendored libraries
|
||||||
|
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
# packaging, via the `propose-downstream` packit action.
|
# packaging, via the `propose-downstream` packit action.
|
||||||
# The goimports don't need to be present upstream.
|
# The goimports don't need to be present upstream.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
SPEC_FILE=$(pwd)/podman.spec
|
SPEC_FILE=$(pwd)/podman.spec
|
||||||
|
|
||||||
sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE
|
sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE
|
||||||
|
@ -4,6 +4,8 @@
|
|||||||
# default. Useful for local manual rpm builds where the Version needs to be set
|
# default. Useful for local manual rpm builds where the Version needs to be set
|
||||||
# correctly.
|
# correctly.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
SPEC_FILE=$(pwd)/podman.spec
|
SPEC_FILE=$(pwd)/podman.spec
|
||||||
LATEST_TAG=$(git tag --sort=creatordate | tail -1)
|
LATEST_TAG=$(git tag --sort=creatordate | tail -1)
|
||||||
LATEST_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')
|
LATEST_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')
|
||||||
|
Reference in New Issue
Block a user