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

Upgrade nfpm and set release in config #4

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Conversation

kpenfound
Copy link
Contributor

RELTOOL-87

This will include the package release in the package names and metadata.

TODO: test building packages and verify naming

@kpenfound
Copy link
Contributor Author

kpenfound commented Feb 28, 2022

Test results:
Before change:

$ docker run -e INPUT_NAME=test -e INPUT_ARCH=amd64 -e INPUT_VERSION=1.0.0-rc1+ent -e INPUT_BINARY=nfpm_rpm_config.yaml -e INPUT_MAINTAINER=test actions-packaging-linux
Creating template files...
Packaging...
using rpm packager...
created package: out/test-1.0.0~rc1+ent.x86_64.rpm
using deb packager...
created package: out/test_1.0.0~rc1+ent_amd64.deb

after change:

$ docker run -e INPUT_NAME=test -e INPUT_ARCH=amd64 -e INPUT_VERSION=1.0.0-rc1+ent -e INPUT_BINARY=nfpm_rpm_config.yaml -e INPUT_MAINTAINER=test actions-packaging-linux
Creating template files...
Packaging...
using rpm packager...
created package: out/test-1.0.0~rc1+ent-1.x86_64.rpm
using deb packager...
created package: out/test_1.0.0~rc1+ent-1_amd64.deb

This looks right to me. Does this look like you expect it to @shore ? (Adding the -1 release)

@kpenfound kpenfound marked this pull request as ready for review February 28, 2022 18:57
@shore
Copy link
Contributor

shore commented Mar 1, 2022

after change:
...
created package: out/test-1.0.0rc1+ent-1.x86_64.rpm
...
created package: out/test_1.0.0
rc1+ent-1_amd64.deb


This looks right to me. Does this look like you expect it to @shore ? (Adding the `-1` release)

Looks OK to me. The filenames parse like this:

Fields{
    Arch:           "amd64",
    OS:             "linux",
    Product:        "test",
    Type:           "deb",
    Version:        "1.0.0~rc1+ent",
    PackageRelease: "1",
}
Fields{
    Arch:           "x86_64",
    OS:             "linux",
    Product:        "test",
    Type:           "rpm",
    Version:        "1.0.0~rc1+ent",
    PackageRelease: "1",
}

The releases service still doesn't know what to do with ~ delimiters, so prerelease packages I think still can't be submitted to the service. But the package release part works as expected.

@kpenfound
Copy link
Contributor Author

Perfect, thanks! Yeah this isn't hoping to address the prerelease notation, just the package release

@kpenfound kpenfound requested review from a team, alvin-huang and claire-labry and removed request for a team March 1, 2022 19:46
@kpenfound kpenfound merged commit 353a2c1 into main Mar 2, 2022
@kpenfound kpenfound deleted the upgrade_nfpm_set_release branch March 2, 2022 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants