Skip to content

Commit fde276d

Browse files
author
Jose Javier Merchante
committed
Update version formatting for release candidates
Add support for formatting alpha and beta versions in the release workflow. This change ensures that versions like 1.2.3-alpha.1 and 1.2.3-beta.1 are correctly formatted to 1.2.3a1 and 1.2.3b1, respectively. Fix also the package name of chronicler to grimoirelab-chronicler. Signed-off-by: Jose Javier Merchante <jjmerchante@bitergia.com>
1 parent 8938b48 commit fde276d

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

.github/workflows/grimoirelab-release.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
echo "bump_major=${{ inputs.bump_major }}" >> $GITHUB_OUTPUT
5757
5858
grimoirelab-chronicler:
59-
name: chronicler
59+
name: GrimoireLab Chronicler
6060
needs:
6161
- variables-job
6262
uses: ./.github/workflows/release-grimoirelab-component.yml
@@ -131,7 +131,7 @@ jobs:
131131
- id: semverup
132132
name: Update version number
133133
env:
134-
chronicler_version: "${{ needs.grimoirelab-chronicler.outputs.version}}"
134+
grimoirelab_chronicler_version: "${{ needs.grimoirelab-chronicler.outputs.version}}"
135135
grimoirelab_core_version: "${{ needs.grimoirelab-core.outputs.version}}"
136136
run: |
137137
BUMP_MAJOR=4
@@ -143,9 +143,13 @@ jobs:
143143
old=$1
144144
old=${old%-*}
145145
old=${old%rc*}
146+
old=${old%a*}
147+
old=${old%b*}
146148
current=$2
147149
current=${current%-*}
148150
current=${current%rc*}
151+
current=${current%a*}
152+
current=${current%b*}
149153
150154
currentArr=(${current//./ })
151155
oldArr=(${old//./ })
@@ -169,7 +173,7 @@ jobs:
169173
poetry show -l $pkg | grep version | head -1 | awk '{print $3}'
170174
}
171175
172-
pkgs=("chronicler"
176+
pkgs=("grimoirelab-chronicler"
173177
"grimoirelab-core")
174178
175179
if [ ${{ inputs.prerelease }} == 'true' ]
@@ -275,9 +279,9 @@ jobs:
275279
- name: Generate NEWS from packages
276280
if: steps.custom_notes.outputs.custom_notes == 'false'
277281
env:
278-
notes_chronicler: "${{ needs.grimoirelab-chronicler.outputs.notes}}"
282+
notes_grimoirelab_chronicler: "${{ needs.grimoirelab-chronicler.outputs.notes}}"
279283
notes_grimoirelab_core: "${{ needs.grimoirelab-core.outputs.notes}}"
280-
version_chronicler: "${{ needs.grimoirelab-chronicler.outputs.version }}"
284+
version_grimoirelab_chronicler: "${{ needs.grimoirelab-chronicler.outputs.version }}"
281285
version_grimoirelab_core: "${{ needs.grimoirelab-core.outputs.version }}"
282286
run: |
283287
version=${{ steps.semverup.outputs.version }}
@@ -287,7 +291,7 @@ jobs:
287291
today=$(date -u "+%Y-%m-%d")
288292
289293
packages=(
290-
chronicler
294+
grimoirelab_chronicler
291295
grimoirelab_core
292296
)
293297

.github/workflows/release-grimoirelab-component.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,14 @@ jobs:
294294
run: |
295295
package="${{ inputs.module_name }}"
296296
version="${{ steps.version.outputs.version }}"
297-
# Format version 1.2.3-rc.1 to 1.2.3rc1
297+
# Format rc version 1.2.3-rc.1 to 1.2.3rc1
298+
# Format alpha version 1.2.3-alpha.1 to 1.2.3a1
299+
# Format beta version 1.2.3-beta.1 to 1.2.3b1
298300
versionNum=${version%-*}
299301
versionRC=${version#$versionNum}
300302
versionRC=${versionRC//[-.]/}
303+
versionRC=${versionRC//alpha/a}
304+
versionRC=${versionRC//beta/b}
301305
currentVersion="${versionNum}${versionRC}"
302306
303307
pip install --upgrade pip

0 commit comments

Comments
 (0)