Merge branch '2.x-releases' of 'https://github.com/jjmerchante/grimoirelab'

Merges #815
Closes #815

Author: jjmerchante

.github/workflows/docker-image.yml

@@ -32,6 +32,9 @@ jobs:
           tags: |
             # Generate a raw tag so latest is not used
             type=raw,value=${{ inputs.version }}
+            type=raw,value=2.x
+          build-args: |
+            GRIMOIRELAB_RELEASE=${{ inputs.version }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

.github/workflows/grimoirelab-release.yml

@@ -11,14 +11,20 @@ on:
         description: 'Git config name'
         type: string
         required: true
-      release_candidate:
-        description: 'Create a release candidate version'
+      prerelease:
+        description: 'Create a prerelease version'
         type: string
         required: true
+      prerelease_label:
+        description: 'Label for the prerelease version'
+        type: string
+        required: false
+        default: 'rc'
       bump_major:
         description: 'Create a new major version release'
         type: string
-        required: true
+        required: false
+        default: 'false'
       module_name:
         description: 'Name of the module'
         type: string
@@ -63,10 +69,10 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - name: Set up Python 3.11
+      - name: Set up Python
         uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Set up Git config
         run: |
@@ -83,10 +89,9 @@ jobs:
           cd ${{ inputs.module_directory }}
           git checkout main
 
-      - name: Install poetry
+      - name: Install Poetry
         run: |
-          curl -sSL https://install.python-poetry.org | python3 -
-          echo "PATH=$HOME/.poetry/bin:$PATH" >> $GITHUB_ENV
+          pipx install poetry
         shell: bash
 
       - name: Install release-tools
@@ -143,9 +148,9 @@ jobs:
         continue-on-error: true
         shell: bash {0}
         run: |
-          if [ ${{ inputs.release_candidate }} == 'true' ]
+          if [ ${{ inputs.prerelease }} == 'true' ]
           then
-            rcArg='--pre-release'
+            rcArg='--pre-release --pre-release-label ${{ inputs.prerelease_label }}'
           else
             rcArg=''
           fi
@@ -164,9 +169,9 @@ jobs:
             echo "Dependencies updated, force new version"
             version=$(semverup --bump-version patch $rcArg)
             echo "forced_version=true" >> $GITHUB_OUTPUT
-          elif [ -z $version ] && [ ${{ inputs.release_candidate }} != 'true' ] && [[ "$old_version" =~ .*rc.* ]]
+          elif [ -z $version ] && [ ${{ inputs.prerelease }} != 'true' ] && [[ "$old_version" =~ (alpha|beta|rc) ]]
           then
-            echo "Create final version from rc"
+            echo "Create final version from pre-release"
             version=$(semverup --bump-version patch)
             echo "forced_version=true" >> $GITHUB_OUTPUT
           else
@@ -193,7 +198,7 @@ jobs:
           version=${{ steps.version.outputs.version }}
           eof="EOF$(date +%s)"
           release_file="releases/$version.md"
-          if [ ${{ inputs.release_candidate }} == 'true' ]
+          if [ ${{ inputs.prerelease }} == 'true' ]
           then
             newsArg=''
             rcArg='--pre-release'
@@ -213,8 +218,8 @@ jobs:
             
             * Update Poetry's package dependencies
           EOF
-            # Update NEWS file if it is not a release candidate
-            if [ ${{ inputs.release_candidate }} != 'true' ]
+            # Update NEWS file if it is not a pre-release
+            if [ ${{ inputs.prerelease }} != 'true' ]
             then
               mv NEWS old_NEWS
               echo -e "# Releases\n" >> NEWS
@@ -241,7 +246,7 @@ jobs:
         name: Publish new version.
         if: steps.semverup.outcome == 'success'
         run: |
-          if [ ${{ inputs.release_candidate }} == 'true' ]
+          if [ ${{ inputs.prerelease }} == 'true' ]
           then
             publish ${{ steps.version.outputs.version }} "${{ inputs.git_name }} <${{ inputs.git_email }}>" --push origin --remote-branch main --no-cleanup
           else

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

@@ -35,6 +35,7 @@ jobs:
     - name: Install dependencies
       run: |
         poetry install --with tests -vvv
+        poetry run pip install -r requirements_dev.txt
     - name: Tests
       run: |
         cd tests && poetry run pytest

.github/workflows/tests.yml

@@ -20,8 +20,8 @@
 	path = src/grimoirelab-toolkit
 	url = https://github.com/chaoss/grimoirelab-toolkit.git
 [submodule "src/grimoirelab-chronicler"]
-    path = src/grimoirelab-chronicler
-    url = https://github.com/grimoirelab/grimoirelab-chronicler.git
+	path = src/grimoirelab-chronicler
+	url = https://github.com/grimoirelab/grimoirelab-chronicler.git
 [submodule "src/grimoirelab-core"]
-    path = src/grimoirelab-core
-    url = https://github.com/grimoirelab/grimoirelab-core.git
+	path = src/grimoirelab-core
+	url = https://github.com/grimoirelab/grimoirelab-core.git

.gitmodules

@@ -5,9 +5,11 @@ FROM python:3.12-slim-bullseye
 
 LABEL maintainer="Santiago Dueñas <[email protected]>"
 
+ARG GRIMOIRELAB_RELEASE="2.x"
+
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEPLOY_USER=grimoirelab
-ENV GRIMOIRELAB_RELEASE="2.x"
+ENV GRIMOIRELAB_RELEASE=${GRIMOIRELAB_RELEASE}
 
 # Create a user and a group
 RUN groupadd -r $DEPLOY_USER && useradd -r -m -g $DEPLOY_USER $DEPLOY_USER