diff options
| author | mail_redacted_for_web | 2024-06-16 13:21:43 +0200 |
|---|---|---|
| committer | mail_redacted_for_web | 2024-06-16 13:21:43 +0200 |
| commit | 841414fe2e6fc0b88c7da4251cc326895023b562 (patch) | |
| tree | fcc0863904ae1843ec9a083a22e22550206443f1 | |
| parent | b863c79b58dca3a55c4cdd898b179d680d9de69f (diff) | |
| download | lirion-initfunctions-841414fe2e6fc0b88c7da4251cc326895023b562.tar.bz2 | |
include changelog init in make, remove prerelease and git stings from version
| -rw-r--r-- | nfpm/.gitignore | 1 | ||||
| -rw-r--r-- | nfpm/Makefile | 5 | ||||
| -rw-r--r-- | nfpm/nfpm.yaml | 4 | ||||
| -rw-r--r-- | nfpm/nfpm.yaml.skel | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/nfpm/.gitignore b/nfpm/.gitignore index 796b96d..476a51d 100644 --- a/nfpm/.gitignore +++ b/nfpm/.gitignore @@ -1 +1,2 @@ /build +/changelog.yml diff --git a/nfpm/Makefile b/nfpm/Makefile index 0224e8a..46eeb65 100644 --- a/nfpm/Makefile +++ b/nfpm/Makefile @@ -1,4 +1,4 @@ -all: skel build +all: skel chglog build skel: @grep -vP '^[\t\ ]*#' nfpm.yaml.skel | tr -s '\n' > nfpm.yaml @@ -10,3 +10,6 @@ build-deb: build-rpm: @nfpm pkg --packager rpm --target ./build/ + +chglog: + @chglog init diff --git a/nfpm/nfpm.yaml b/nfpm/nfpm.yaml index 2f1d8b1..1d25651 100644 --- a/nfpm/nfpm.yaml +++ b/nfpm/nfpm.yaml @@ -4,8 +4,6 @@ platform: linux version: 1.0.0 version_schema: semver epoch: 1 -prerelease: wtf1 -version_metadata: git release: 1 section: admin priority: optional @@ -15,7 +13,7 @@ vendor: lirion.de homepage: https://git.lirion.de/lirion-initfunctions/ license: LGLPv3 mtime: "2024-06-16T12:30:00Z" -changelog: "changelog.yaml" +changelog: "changelog.yml" disable_globbing: false depends: - bash diff --git a/nfpm/nfpm.yaml.skel b/nfpm/nfpm.yaml.skel index e76b8eb..c5a775b 100644 --- a/nfpm/nfpm.yaml.skel +++ b/nfpm/nfpm.yaml.skel @@ -42,14 +42,14 @@ epoch: 1 # Default is extracted from `version` if it is semver compatible. # This is appended to the `version`, e.g. `1.2.3+beta1`. If the `version` is # semver compatible, then this replaces the prerelease component of the semver. -prerelease: wtf1 +#prerelease: wtf1 # Version Metadata (previously deb.metadata). # Default is extracted from `version` if it is semver compatible. # Setting metadata might interfere with version comparisons depending on the # packager. If the `version` is semver compatible, then this replaces the # version metadata component of the semver. -version_metadata: git +#version_metadata: git # Version Release, aka revision. # This will expand any env var you set in the field, e.g. release: ${VERSION_RELEASE} |