Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packit, don't touch version, change release #748

Merged

Conversation

@TomasTomecek
Copy link
Contributor

TomasTomecek commented Mar 5, 2020

Example:

packit-0.8.1-1.20200305174322588258.104.g14f3e25.fc31.src.rpm

TODO:

  • get rid of the version stuff
  • doks - actually, there is not much to document here
  • fix tests
  • The template string for the release is not gonna be configurable.
  • test this with our biggest customers to make sure we're not breaking them (tried with packit, ogr, osbuild and tmt)

Fixes #693

Signed-off-by: Tomas Tomecek ttomecek@redhat.com

@softwarefactory-project-zuul

This comment was marked as outdated.

Copy link
Contributor

softwarefactory-project-zuul bot commented Mar 5, 2020

Build failed.

@packit-as-a-service

This comment has been minimized.

Copy link

packit-as-a-service bot commented Mar 5, 2020

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/packit-service-packit-748
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

@jpopelka

This comment has been minimized.

Copy link
Member

jpopelka commented Mar 6, 2020

looks OK so far

@TomasTomecek TomasTomecek force-pushed the TomasTomecek:693 branch from 776fc5b to b1f9bed Mar 6, 2020
@softwarefactory-project-zuul

This comment was marked as outdated.

Copy link
Contributor

softwarefactory-project-zuul bot commented Mar 6, 2020

Build failed.

Fixes #693

Read that issue for more info (and get a coffee).

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
@TomasTomecek TomasTomecek force-pushed the TomasTomecek:693 branch from b1f9bed to a3dd6ab Mar 9, 2020
@TomasTomecek TomasTomecek added the mergeit label Mar 9, 2020
@softwarefactory-project-zuul

This comment has been minimized.

Copy link
Contributor

softwarefactory-project-zuul bot commented Mar 9, 2020

Build succeeded.

# git adds various info in the output separated by -
# so let's just drop version and reuse everything else
g_desc_raw = git_des_out.split("-", 1)[1]
Comment on lines +492 to +494

This comment has been minimized.

Copy link
@csomh

csomh Mar 10, 2020

Member

Will this work for all projects? Are tags always versions only? The reason for asking is b/c in git.centos.org, I see tags like imports/c8/rpm-4.14.2-25.el8, which also contain a version, but they will fail to be processed this way.

This comment has been minimized.

Copy link
@TomasTomecek

TomasTomecek Mar 10, 2020

Author Contributor

that's git-describe specific, it uses dashes to separate different data - sadly one cannot format it

yeah, we may need to polish this for centos stream - or figure out how to operate with release and version - we will be in control of the repos, so we may use more sensible tags

This comment has been minimized.

Copy link
@TomasTomecek

TomasTomecek Mar 10, 2020

Author Contributor

what I wrote is bullshit, I thought we're talking about something else - in your case, curse all the people who use dashes in tags

self._fix_spec_source(archive)
self._fix_spec_prep(version)

msg = f"- Development snapshot ({commit})"
self.specfile.set_spec_version(version=f"{version}", changelog_entry=msg)
release = template.format(

This comment has been minimized.

Copy link
@csomh

csomh Mar 10, 2020

Member

Would using a format-string and dropping template make things easier to read?

This comment has been minimized.

Copy link
@TomasTomecek

TomasTomecek Mar 10, 2020

Author Contributor

uuhhhhhhhhhhhhhhhh

Copy link
Member

jpopelka left a comment

LGTM, just would be nicer if you could define variables (original_release_number, current_time, template, msg) closer to where they are used.

@softwarefactory-project-zuul

This comment has been minimized.

Copy link
Contributor

softwarefactory-project-zuul bot commented Mar 10, 2020

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 818f05a into packit-service:master Mar 10, 2020
10 checks passed
10 checks passed
LGTM analysis: Python No new or fixed alerts
Details
ci/dockercloud Your tests passed in Docker Cloud
Details
local/check check status: success
Details
local/gate gate status: success
Details
packit/rpm-build-fedora-30-x86_64 RPMs were built successfully.
Details
packit/rpm-build-fedora-31-x86_64 RPMs were built successfully.
Details
packit/rpm-build-fedora-32-x86_64 RPMs were built successfully.
Details
packit/rpm-build-fedora-rawhide-x86_64 RPMs were built successfully.
Details
packit/testing-farm-fedora-30-x86_64 All tests passed
Details
packit/testing-farm-fedora-31-x86_64 All tests passed
Details
@TomasTomecek

This comment has been minimized.

Copy link
Contributor Author

TomasTomecek commented Mar 10, 2020

#759 flwup

@TomasTomecek TomasTomecek deleted the TomasTomecek:693 branch Mar 10, 2020
@TomasTomecek TomasTomecek mentioned this pull request Mar 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.