Skip to content

Commit c2ccf66

Browse files
Fix release candidate version for rpm
1 parent b705052 commit c2ccf66

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
- name: Check versions (Python package and RPM specification)
113113
shell: bash
114114
run: |
115-
PACKAGE_VERSION=$(poetry version --short)
115+
PACKAGE_VERSION=$(poetry version --short | sed s'/-rc\./~rc/')
116116
RPM_VERSION=$(rpmspec -q --qf "%{version}" ci-scripts/linux/rpm/python3-nitrokey.spec)
117117
if [ $PACKAGE_VERSION == $RPM_VERSION ]; then exit 0; else exit 1; fi
118118
build-docs:

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FORMAT_DIRS := src stubs tests
22
LINT_DIRS := src tests
3-
PACKAGE_VERSION:=$(shell poetry version --short)
3+
PACKAGE_VERSION := $(shell poetry version --short)
44

55
.PHONY: install
66
install:
@@ -63,5 +63,6 @@ build-docs:
6363
poetry run sphinx-build --fail-on-warning docs _build
6464

6565
.PHONY: update-version
66+
update-version: RPM_VERSION=$(shell echo ${PACKAGE_VERSION} | sed 's/-rc\./~rc/')
6667
update-version:
67-
sed -i "/^Version:/s/[[:digit:]].*/$(PACKAGE_VERSION)/" ci-scripts/linux/rpm/python3-nitrokey.spec
68+
sed -i "/^Version:/s/[[:digit:]].*/$(RPM_VERSION)/" ci-scripts/linux/rpm/python3-nitrokey.spec

ci-scripts/linux/rpm/python3-nitrokey.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: python3-nitrokey
2-
Version: 0.2.4-rc.1
2+
Version: 0.2.4~rc1
33
Release: %autorelease
44
Summary: Python SDK for Nitrokey devices
55

0 commit comments

Comments
 (0)