Skip to content

Commit 9683743

Browse files
committed
Fix update_version.sh
1 parent b7c6afa commit 9683743

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

.github/workflows/update-version-test.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,35 @@ jobs:
1717
run: |
1818
sudo apt-get update
1919
sudo apt-get -y install git
20+
2021
git config --global user.name "Dr. John Doe"
2122
git config --global user.email jdoe@example.com
2223
2324
- name: Update to version with a phase
2425
run: |
2526
./update_version.sh 12 1 0 beta1
27+
28+
git show
2629
git tag --points-at HEAD > actual
2730
echo v12.1.0-beta1 > expected
2831
diff expected actual
2932
3033
- name: Update to version without a phase
3134
run: |
3235
./update_version.sh 12 1 0
36+
37+
git show
3338
git tag --points-at HEAD > actual
3439
echo v12.1.0 > expected
40+
3541
diff expected actual
3642
3743
- name: Update to version with a phase again
3844
run: |
3945
./update_version.sh 12 2 0 alpha1
46+
47+
git show
4048
git tag --points-at HEAD > actual
4149
echo v12.2.0-alpha1 > expected
50+
4251
diff expected actual

pki.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ License: GPL-2.0-only AND LGPL-2.0-only
2323
# - development (unsupported): alpha<n> where n >= 1
2424
# - stabilization (supported): beta<n> where n >= 1
2525
# - GA/update (supported): <none>
26-
##global phase
26+
%undefine phase
2727

2828
%undefine timestamp
2929
%undefine commit_id

update_version.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ change_spec_version() {
5353
if [[ "$CURRENT_PHASE" != "$NEXT_PHASE" ]] ; then
5454
if [ -z "$NEXT_PHASE" ] ; then
5555
echo "Remove phase"
56-
sed -i "/phase /c\#global phase" pki.spec
56+
sed -i "/phase /c\%undefine phase" pki.spec
5757
elif [ -z "$CURRENT_PHASE" ] ; then
5858
echo "Add phase, set to $NEXT_PHASE"
59-
sed -i "/#global phase/c\%global phase $NEXT_PHASE" pki.spec
59+
sed -i "/\%undefine *phase/c\%global phase $NEXT_PHASE" pki.spec
6060
else
6161
echo "Update phase to $NEXT_PHASE"
6262
sed -i "/phase /c\%global phase $NEXT_PHASE" pki.spec
@@ -66,7 +66,7 @@ change_spec_version() {
6666

6767
commit_version_change() {
6868
git add pki.spec
69-
git commit -m "Updating version to v$NEXT_VERSION"
69+
git commit -m "Update version number to $NEXT_VERSION"
7070
}
7171

7272
create_tag() {

0 commit comments

Comments
 (0)